remove accept_server_txids from zingoconfig

Author: fluidvanadium

darkside-tests/src/chain_generics.rs

@@ -36,7 +36,7 @@ proptest! {
 pub(crate) mod conduct_chain {
     //! known issues include
     //!   - transparent sends do not work
-    //!   - txids are regenerated randomly. zingo can optionally accept_server_txid
+    //!   - txids are regenerated randomly. this means zingo has to do extra work to adjust.
     //!   - these tests cannot portray the full range of network weather.
 
     use orchard::tree::MerkleHashOrchard;
@@ -65,10 +65,9 @@ pub(crate) mod conduct_chain {
         async fn create_faucet(&mut self) -> LightClient {
             self.stage_transaction(ABANDON_TO_DARKSIDE_SAP_10_000_000_ZAT)
                 .await;
-            let mut zingo_config = self
+            let zingo_config = self
                 .client_builder
                 .make_unique_data_dir_and_load_config(self.regtest_network);
-            zingo_config.accept_server_txids = true;
             LightClient::create_from_wallet_base_async(
                 WalletBase::MnemonicPhrase(DARKSIDE_SEED.to_string()),
                 &zingo_config,

darkside-tests/tests/tests.rs

@@ -255,7 +255,7 @@ async fn evicted_transaction_is_rebroadcast() {
 
     let primary = environment.fund_client_orchard(1_000_000).await;
     let secondary = environment.create_client().await;
-    primary.do_sync(false).await;
+    primary.do_sync(false).await.unwrap();
 
     let proposal = to_clients_proposal(
         &primary,
@@ -275,7 +275,7 @@ async fn evicted_transaction_is_rebroadcast() {
         zingolib::testutils::lightclient::list_txids(&primary).await
     );
 
-    let recorded_fee = *zingolib::testutils::assertions::lookup_fees_with_proposal_check(
+    let _recorded_fee = *zingolib::testutils::assertions::lookup_fees_with_proposal_check(
         &primary, &proposal, txids,
     )
     .await
@@ -323,7 +323,7 @@ async fn evicted_transaction_is_rebroadcast() {
 
     send_height = 0;
 
-    primary.do_sync(false).await;
+    primary.do_sync(false).await.unwrap();
 
     zingolib::testutils::lightclient::lookup_statuses(&primary, txids.clone())
         .await
@@ -335,5 +335,5 @@ async fn evicted_transaction_is_rebroadcast() {
         });
 
     let ref_primary: Arc<LightClient> = Arc::new(primary);
-    LightClient::start_mempool_monitor(ref_primary);
+    LightClient::start_mempool_monitor(ref_primary).unwrap();
 }

zingolib/src/config.rs

@@ -96,7 +96,6 @@ pub fn load_clientconfig(
         wallet_dir: data_dir,
         wallet_name: DEFAULT_WALLET_NAME.into(),
         logfile_name: DEFAULT_LOGFILE_NAME.into(),
-        accept_server_txids: false,
     };
 
     Ok(config)
@@ -140,8 +139,6 @@ pub struct ZingoConfigBuilder {
     pub wallet_name: Option<PathBuf>,
     /// The filename of the logfile. This will be created in the `wallet_dir`.
     pub logfile_name: Option<PathBuf>,
-    /// If this option is enabled, the LightClient will replace outgoing TxId records with the TxId picked by the server. necessary for darkside.
-    pub accept_server_txids: bool,
 }
 
 /// Configuration data that is necessary? and sufficient? for the creation of a LightClient.
@@ -161,8 +158,6 @@ pub struct ZingoConfig {
     pub wallet_name: PathBuf,
     /// The filename of the logfile. This will be created in the `wallet_dir`.
     pub logfile_name: PathBuf,
-    /// If this option is enabled, the LightClient will replace outgoing TxId records with the TxId picked by the server. necessary for darkside.
-    pub accept_server_txids: bool,
 }
 
 impl ZingoConfigBuilder {
@@ -218,7 +213,6 @@ impl ZingoConfigBuilder {
             wallet_dir: self.wallet_dir.clone(),
             wallet_name: DEFAULT_WALLET_NAME.into(),
             logfile_name: DEFAULT_LOGFILE_NAME.into(),
-            accept_server_txids: self.accept_server_txids,
         }
     }
 }
@@ -233,7 +227,6 @@ impl Default for ZingoConfigBuilder {
             wallet_name: None,
             logfile_name: None,
             chain: ChainType::Mainnet,
-            accept_server_txids: false,
         }
     }
 }

zingolib/src/lightclient/send.rs

@@ -240,6 +240,7 @@ pub mod send_with_proposal {
                                 ) {
                                     Ok(reported_txid) => {
                                         // happens during darkside tests
+                                        // If this option is enabled, the LightClient will replace outgoing TxId records with the TxId picked by the server. necessary for darkside.
                                         // #[cfg(feature = "darkside_tests")]
                                         // if txid != reported_txid {
                                         //     println!(

zingolib/src/testutils/chain_generics/conduct_chain.rs

@@ -23,8 +23,7 @@ pub trait ConductChain {
 
     /// builds an empty client
     async fn create_client(&mut self) -> LightClient {
-        let mut zingo_config = self.zingo_config();
-        zingo_config.accept_server_txids = true;
+        let zingo_config = self.zingo_config();
         LightClient::create_from_wallet_base_async(
             crate::wallet::WalletBase::FreshEntropy,
             &zingo_config,
@@ -37,9 +36,6 @@ pub trait ConductChain {
 
     /// loads a client from bytes
     async fn load_client(&mut self, data: &[u8]) -> LightClient {
-        let mut zingo_config = self.zingo_config();
-        zingo_config.accept_server_txids = true;
-
         LightClient::create_from_wallet_async(LightWallet::unsafe_from_buffer_testnet(data).await)
             .await
             .unwrap()