chore: cleaning, #5971

Author: fdefelici

stacks-signer/src/v0/signer_state.rs

@@ -1067,7 +1067,6 @@ impl LocalStateMachine {
         // Check if fork occurred within current reward cycle. Reject tx replay otherwise.
         let reward_cycle_info = client.get_current_reward_cycle_info()?;
 
-        //let target_reward_cycle = reward_cycle_info.reward_cycle;
         let target_reward_cycle = reward_cycle_info.get_reward_cycle(fork_tip.burn_block_height);
         let is_fork_in_current_reward_cycle = fork_info.iter().all(|fork_info| {
             let block_height = fork_info.burn_block_height;

testnet/stacks-node/src/tests/signer/mod.rs

@@ -530,8 +530,12 @@ impl<S: Signer<T> + Send + 'static, T: SignerEventTrait + 'static> SignerTest<Sp
          (define-public (run-update)
            (ok (var-set local-burn-block-ht burn-block-height)))
         ";
-        let (txid, sender_nonce) =
-            self.submit_contract_deploy(sender_sk, 1000, burn_height_contract, "burn-height-local")?;
+        let (txid, sender_nonce) = self.submit_contract_deploy(
+            sender_sk,
+            1000,
+            burn_height_contract,
+            "burn-height-local",
+        )?;
 
         self.wait_for_nonce_increase(&to_addr(&sender_sk), sender_nonce)?;
         Ok(txid)

testnet/stacks-node/src/tests/signer/v0.rs

@@ -3117,7 +3117,10 @@ fn tx_replay_forking_test() {
     let call_fee = 1000;
     let signer_test: SignerTest<SpawnedSigner> = SignerTest::new_with_config_modifications(
         num_signers,
-        vec![(sender_addr, (send_amt + send_fee) * 10 + deploy_fee + call_fee)],
+        vec![(
+            sender_addr,
+            (send_amt + send_fee) * 10 + deploy_fee + call_fee,
+        )],
         |c| {
             c.validate_with_replay_tx = true;
         },
@@ -4874,7 +4877,12 @@ fn tx_replay_with_fork_middle_replay_while_tenure_extending() {
     // First, just deploy the contract in its own tenure
     let contract_code = make_big_read_count_contract(HELIUM_BLOCK_LIMIT_20, 50);
     let (_deploy_txid, deploy_nonce) = signer_test
-        .submit_contract_deploy(&sender_sk, deploy_fee, contract_code.as_str(), "big-contract")
+        .submit_contract_deploy(
+            &sender_sk,
+            deploy_fee,
+            contract_code.as_str(),
+            "big-contract",
+        )
         .unwrap();
     signer_test
         .wait_for_nonce_increase(&sender_addr, deploy_nonce)
@@ -5067,7 +5075,10 @@ fn tx_replay_with_fork_middle_replay_while_tenure_extending_and_new_tx_submitted
     let signer_test: SignerTest<SpawnedSigner> = SignerTest::new_with_config_modifications(
         num_signers,
         vec![
-            (sender1_addr, send1_deploy_fee + send1_call_fee * send1_call_num),
+            (
+                sender1_addr,
+                send1_deploy_fee + send1_call_fee * send1_call_num,
+            ),
             (sender2_addr, (send2_amt + send2_fee) * send2_txs),
         ],
         |c| {
@@ -5100,7 +5111,12 @@ fn tx_replay_with_fork_middle_replay_while_tenure_extending_and_new_tx_submitted
     // First, just deploy the contract in its own tenure
     let contract_code = make_big_read_count_contract(HELIUM_BLOCK_LIMIT_20, 50);
     let (_deploy_txid, deploy_nonce) = signer_test
-        .submit_contract_deploy(&sender1_sk, send1_deploy_fee, contract_code.as_str(), "big-contract")
+        .submit_contract_deploy(
+            &sender1_sk,
+            send1_deploy_fee,
+            contract_code.as_str(),
+            "big-contract",
+        )
         .unwrap();
     signer_test
         .wait_for_nonce_increase(&sender1_addr, deploy_nonce)
@@ -5112,7 +5128,13 @@ fn tx_replay_with_fork_middle_replay_while_tenure_extending_and_new_tx_submitted
     // Then, sumbmit 2 Contract Calls that require Tenure Extension to be addressed.
     info!("---- Waiting for first big tx to be mined ----");
     let (txid1, txid1_nonce) = signer_test
-        .submit_contract_call(&sender1_sk, send1_call_fee,"big-contract", "big-tx", &vec![])
+        .submit_contract_call(
+            &sender1_sk,
+            send1_call_fee,
+            "big-contract",
+            "big-tx",
+            &vec![],
+        )
         .unwrap();
 
     signer_test
@@ -5121,7 +5143,13 @@ fn tx_replay_with_fork_middle_replay_while_tenure_extending_and_new_tx_submitted
 
     info!("---- Waiting for second big tx to be mined ----");
     let (txid2, txid2_nonce) = signer_test
-        .submit_contract_call(&sender1_sk, send1_call_fee, "big-contract", "big-tx", &vec![])
+        .submit_contract_call(
+            &sender1_sk,
+            send1_call_fee,
+            "big-contract",
+            "big-tx",
+            &vec![],
+        )
         .unwrap();
 
     // Tenure Extend happen because of tenure budget exceeded
@@ -17182,7 +17210,13 @@ fn bitcoin_reorg_extended_tenure() {
 
     miners
         .signer_test
-        .submit_contract_call(&miners.sender_sk, 1000,"burn-height-local", "run-update", &[])
+        .submit_contract_call(
+            &miners.sender_sk,
+            1000,
+            "burn-height-local",
+            "run-update",
+            &[],
+        )
         .unwrap();
 
     let rc = miners.signer_test.get_current_reward_cycle();