Revert "Fix fuzz tests (ordinals#3416)"

This reverts commit 3de5a71.

fuzz/Cargo.toml

@@ -18,7 +18,6 @@ arbitrary = { version = "1", features = ["derive"] }
 bitcoin = { version = "0.30.0", features = ["rand"] }
 libfuzzer-sys = "0.4"
 ord = { path = ".." }
-ordinals = { path = "../crates/ordinals" }
 
 [[bin]]
 name = "runestone-decipher"

fuzz/fuzz_targets/runestone_decipher.rs

@@ -7,7 +7,7 @@ use {
     Transaction, TxOut,
   },
   libfuzzer_sys::fuzz_target,
-  ordinals::Runestone,
+  ord::runes::Runestone,
 };
 
 fuzz_target!(|input: Vec<Vec<u8>>| {

fuzz/fuzz_targets/transaction_builder.rs

@@ -7,8 +7,7 @@ use {
     Amount, OutPoint,
   },
   libfuzzer_sys::fuzz_target,
-  ord::{FeeRate, Target, TransactionBuilder},
-  ordinals::SatPoint,
+  ord::{FeeRate, SatPoint, Target, TransactionBuilder},
   std::collections::{BTreeMap, BTreeSet},
 };
 

fuzz/fuzz_targets/varint_decode.rs

@@ -1,19 +1,16 @@
 #![no_main]
 
-use {libfuzzer_sys::fuzz_target, ordinals::varint};
+use {libfuzzer_sys::fuzz_target, ord::runes::varint};
 
 fuzz_target!(|input: &[u8]| {
   let mut i = 0;
 
   while i < input.len() {
-    let Some((decoded, length)) = varint::decode(&input[i..]) else {
-      break;
-    };
+    let (decoded, length) = varint::decode(&input[i..]);
     let mut encoded = Vec::new();
     varint::encode_to_vec(decoded, &mut encoded);
-    let (redecoded, redecoded_length) = varint::decode(&input[i..]).unwrap();
+    let (redecoded, _) = varint::decode(&input[i..]);
     assert_eq!(redecoded, decoded);
-    assert_eq!(redecoded_length, length);
     i += length;
   }
 });

fuzz/fuzz_targets/varint_encode.rs

@@ -1,11 +1,11 @@
 #![no_main]
 
-use {libfuzzer_sys::fuzz_target, ordinals::varint};
+use {libfuzzer_sys::fuzz_target, ord::runes::varint};
 
 fuzz_target!(|input: u128| {
   let mut encoded = Vec::new();
   varint::encode_to_vec(input, &mut encoded);
-  let (decoded, length) = varint::decode(&encoded).unwrap();
+  let (decoded, length) = varint::decode(&encoded);
   assert_eq!(length, encoded.len());
   assert_eq!(decoded, input);
 });

justfile

@@ -107,10 +107,10 @@ fuzz:
   set -euxo pipefail
   cd fuzz
   while true; do
+    cargo +nightly fuzz run transaction-builder -- -max_total_time=60
     cargo +nightly fuzz run runestone-decipher -- -max_total_time=60
     cargo +nightly fuzz run varint-decode -- -max_total_time=60
     cargo +nightly fuzz run varint-encode -- -max_total_time=60
-    cargo +nightly fuzz run transaction-builder -- -max_total_time=60
   done
 
 open:

src/index.rs

@@ -30,7 +30,7 @@ use {
   std::{
     collections::HashMap,
     io::{BufWriter, Write},
-    sync::Once,
+    sync::{Mutex, Once},
   },
 };
 

src/inscriptions/envelope.rs

@@ -3,6 +3,7 @@ use {
   bitcoin::blockdata::{
     opcodes,
     script::{
+      self,
       Instruction::{self, Op, PushBytes},
       Instructions,
     },

src/inscriptions/inscription.rs

@@ -1,10 +1,13 @@
 use {
   super::*,
   anyhow::ensure,
-  bitcoin::blockdata::opcodes,
+  bitcoin::{
+    blockdata::{opcodes, script},
+    ScriptBuf,
+  },
   brotli::enc::{writer::CompressorWriter, BrotliEncoderParams},
   http::header::HeaderValue,
-  io::Write,
+  io::{Cursor, Read, Write},
   std::str,
 };
 

src/subcommand/server.rs

@@ -30,7 +30,7 @@ use {
     caches::DirCache,
     AcmeConfig,
   },
-  std::{cmp::Ordering, str, sync::Arc},
+  std::{cmp::Ordering, io::Read, str, sync::Arc},
   tokio_stream::StreamExt,
   tower_http::{
     compression::CompressionLayer,

src/subcommand/server/server_config.rs

@@ -1,4 +1,7 @@
-use {super::*, axum::http::HeaderName};
+use {
+  super::*,
+  axum::http::{header, HeaderName},
+};
 
 #[derive(Default)]
 pub(crate) struct ServerConfig {

src/subcommand/wallet.rs

@@ -2,6 +2,7 @@ use {
   super::*,
   crate::wallet::{batch, Wallet},
   bitcoincore_rpc::bitcoincore_rpc_json::ListDescriptorsResult,
+  reqwest::Url,
   shared_args::SharedArgs,
 };
 

src/subcommand/wallet/balance.rs

@@ -1,4 +1,4 @@
-use super::*;
+use {super::*, std::collections::BTreeSet};
 
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 pub struct Output {

src/subcommand/wallet/cardinals.rs

@@ -1,4 +1,4 @@
-use super::*;
+use {super::*, std::collections::BTreeSet};
 
 #[derive(Serialize, Deserialize)]
 pub struct CardinalUtxo {

src/subcommand/wallet/send.rs

@@ -1,4 +1,9 @@
-use {super::*, crate::outgoing::Outgoing, base64::Engine, bitcoin::psbt::Psbt};
+use {
+  super::*,
+  crate::{outgoing::Outgoing, wallet::transaction_builder::Target},
+  base64::Engine,
+  bitcoin::psbt::Psbt,
+};
 
 #[derive(Debug, Parser)]
 pub(crate) struct Send {

src/templates.rs

@@ -94,6 +94,10 @@ pub(crate) trait PageContent: Display + 'static {
   {
     PageHtml::new(self, server_config)
   }
+
+  fn preview_image_url(&self) -> Option<Trusted<String>> {
+    None
+  }
 }
 
 #[cfg(test)]

src/templates/inscription.rs

@@ -24,6 +24,10 @@ impl PageContent for InscriptionHtml {
   fn title(&self) -> String {
     format!("Inscription {}", self.number)
   }
+
+  fn preview_image_url(&self) -> Option<Trusted<String>> {
+    Some(Trusted(format!("/content/{}", self.id)))
+  }
 }
 
 #[cfg(test)]

src/wallet.rs

@@ -6,6 +6,7 @@ use {
   bitcoin::{
     bip32::{ChildNumber, DerivationPath, ExtendedPrivKey, Fingerprint},
     psbt::Psbt,
+    Network,
   },
   bitcoincore_rpc::bitcoincore_rpc_json::{Descriptor, ImportDescriptors, Timestamp},
   fee_rate::FeeRate,
@@ -14,7 +15,7 @@ use {
     try_join, TryFutureExt,
   },
   miniscript::descriptor::{DescriptorSecretKey, DescriptorXKey, Wildcard},
-  reqwest::header,
+  reqwest::{header, Url},
   transaction_builder::TransactionBuilder,
 };