Merge branch 'master' into disambiguate

src/index.rs

@@ -633,7 +633,7 @@ impl Index {
   }
 
   pub(crate) fn export(&self, filename: &String, include_addresses: bool) -> Result {
-    let mut writer = BufWriter::new(File::create(filename)?);
+    let mut writer = BufWriter::new(fs::File::create(filename)?);
     let rtx = self.database.begin_read()?;
 
     let blocks_indexed = rtx

src/lib.rs

@@ -25,7 +25,6 @@ use {
     },
     into_usize::IntoUsize,
     representation::Representation,
-    runes::Etching,
     settings::Settings,
     subcommand::{Subcommand, SubcommandResult},
     tally::Tally,
@@ -63,7 +62,7 @@ use {
     collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque},
     env,
     fmt::{self, Display, Formatter},
-    fs::{self, File},
+    fs,
     io::{self, Cursor, Read},
     mem,
     net::ToSocketAddrs,

src/settings.rs

@@ -73,7 +73,7 @@ impl Settings {
     };
 
     let config = if let Some(config_path) = config_path {
-      serde_yaml::from_reader(File::open(&config_path).context(anyhow!(
+      serde_yaml::from_reader(fs::File::open(&config_path).context(anyhow!(
         "failed to open config file `{}`",
         config_path.display()
       ))?)
@@ -973,7 +973,7 @@ mod tests {
 
   #[test]
   fn example_config_file_is_valid() {
-    let _: Settings = serde_yaml::from_reader(File::open("ord.yaml").unwrap()).unwrap();
+    let _: Settings = serde_yaml::from_reader(fs::File::open("ord.yaml").unwrap()).unwrap();
   }
 
   #[test]

src/subcommand/decode.rs

@@ -77,7 +77,7 @@ impl Decode {
         .bitcoin_rpc_client(None)?
         .get_raw_transaction(&txid, None)?
     } else if let Some(file) = self.file {
-      Transaction::consensus_decode(&mut File::open(file)?)?
+      Transaction::consensus_decode(&mut fs::File::open(file)?)?
     } else {
       Transaction::consensus_decode(&mut io::stdin())?
     };

src/subcommand/env.rs

@@ -145,7 +145,7 @@ rpcport={bitcoind_port}
     }
 
     serde_json::to_writer_pretty(
-      File::create(self.directory.join("env.json"))?,
+      fs::File::create(self.directory.join("env.json"))?,
       &Info {
         bitcoind_port,
         ord_port,

src/subcommand/wallet.rs

@@ -1,9 +1,6 @@
 use {
   super::*,
-  crate::wallet::{
-    inscribe::{Batch, Batchfile, Mode},
-    Wallet,
-  },
+  crate::wallet::{batch, Wallet},
   bitcoincore_rpc::bitcoincore_rpc_json::ListDescriptorsResult,
   reqwest::Url,
 };