replace external_sync with batch_sync

Author: Davidson-Souza

config.toml.sample

@@ -7,4 +7,4 @@ rpc_password = "SomePassword"
 rpc_host = "https://127.0.0.1:38334"
 
 [misc]
-external_sync = ""
+batch_sync = ""

src/blockchain/cli_blockchain/mod.rs

@@ -29,8 +29,8 @@ use super::{
 use crate::try_and_log;
 
 pub struct UtreexodBackend {
-    pub use_external_sync: bool,
-    pub external_sync_hostname: String,
+    pub use_batch_sync: bool,
+    pub batch_sync_hostname: String,
     pub rpc: Arc<BTCDClient>,
     pub chainstate: Arc<ChainState<KvChainStore>>,
     pub term: Arc<AtomicBool>,
@@ -181,7 +181,7 @@ impl UtreexodBackend {
     }
     #[allow(unused)]
     async fn process_batch_block(&self) -> Result<()> {
-        let socket = TcpStream::connect(self.external_sync_hostname.to_owned().as_str())?;
+        let socket = TcpStream::connect(self.batch_sync_hostname.to_owned().as_str())?;
 
         let height = self.get_height()?;
         let current = self.chainstate.get_validation_index()?;
@@ -270,7 +270,7 @@ impl UtreexodBackend {
             try_and_log!(self.chainstate.flush());
             return;
         }
-        if self.use_external_sync {
+        if self.use_batch_sync {
             try_and_log!(self.process_batch_block().await);
         } else {
             try_and_log!(self.start_ibd().await);

src/cli.rs

@@ -64,10 +64,10 @@ pub enum Commands {
         /// Whether or not we want to sync with a external provider
         #[arg(long)]
         #[arg(default_value_t = false)]
-        use_external_sync: bool,
-        /// If use_external_sync is set, this option provides which server we use
+        use_batch_sync: bool,
+        /// If use_batch_sync is set, this option provides which server we use
         #[arg(long)]
-        external_sync: Option<String>,
+        batch_sync: Option<String>,
         /// Assume blocks before this one as having valid signatures, same with bitcoin core
         #[arg(long)]
         assume_valid: Option<BlockHash>,

src/config_file.rs

@@ -16,7 +16,7 @@ pub struct Rpc {
 }
 #[derive(Default, Debug, Deserialize)]
 pub struct Misc {
-    pub external_sync: Option<String>,
+    pub batch_sync: Option<String>,
 }
 #[derive(Default, Debug, Deserialize)]
 pub struct ConfigFile {

src/main.rs

@@ -74,8 +74,8 @@ fn main() {
             rpc_user,
             rpc_password,
             rpc_host,
-            external_sync,
-            use_external_sync,
+            batch_sync,
+            use_batch_sync,
             rpc_port,
             wallet_xpub,
             assume_valid,
@@ -133,12 +133,12 @@ fn main() {
             let chain_provider = UtreexodBackend {
                 chainstate: blockchain_state.clone(),
                 rpc,
-                external_sync_hostname: get_one_or_another(
-                    external_sync,
-                    data.misc.external_sync,
+                batch_sync_hostname: get_one_or_another(
+                    batch_sync,
+                    data.misc.batch_sync,
                     "".into(),
                 ),
-                use_external_sync,
+                use_batch_sync,
                 term: shutdown,
             };
             info!("Starting server");