Skip to content

Commit b9b42c5

Browse files
fdefelicifdefelici
committed
refactor: remove unused 'is_one_off' and related logic, #6248 
1 parent e4399f8 commit b9b42c5

File tree

7 files changed

+25
-35
lines changed

7 files changed

+25
-35
lines changed

‎testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2950,7 +2950,6 @@ mod tests {
29502950
"9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201",
29512951
)
29522952
.unwrap(),
2953-
false,
29542953
);
29552954
assert!(btc_controller.serialize_tx(
29562955
StacksEpochId::Epoch25,

‎testnet/stacks-node/src/keychain.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ impl Keychain {
228228

229229
/// Create a BurnchainOpSigner representation of this keychain
230230
pub fn generate_op_signer(&self) -> BurnchainOpSigner {
231-
BurnchainOpSigner::new(self.get_secret_key(), false)
231+
BurnchainOpSigner::new(self.get_secret_key())
232232
}
233233
}
234234

@@ -451,7 +451,7 @@ mod tests {
451451
}
452452

453453
pub fn generate_op_signer(&self) -> BurnchainOpSigner {
454-
BurnchainOpSigner::new(self.secret_keys[0], false)
454+
BurnchainOpSigner::new(self.secret_keys[0])
455455
}
456456
}
457457

‎testnet/stacks-node/src/operations.rs

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@ use stacks_common::util::secp256k1::{MessageSignature, Secp256k1PrivateKey, Secp
44

55
pub struct BurnchainOpSigner {
66
secret_key: Secp256k1PrivateKey,
7-
is_one_off: bool,
87
is_disposed: bool,
9-
usages: u8,
108
}
119

1210
impl BurnchainOpSigner {
13-
pub fn new(secret_key: Secp256k1PrivateKey, is_one_off: bool) -> BurnchainOpSigner {
11+
pub fn new(secret_key: Secp256k1PrivateKey) -> BurnchainOpSigner {
1412
BurnchainOpSigner {
1513
secret_key,
16-
usages: 0,
17-
is_one_off,
1814
is_disposed: false,
1915
}
2016
}
@@ -47,11 +43,6 @@ impl BurnchainOpSigner {
4743
return None;
4844
}
4945
};
50-
self.usages += 1;
51-
52-
if self.is_one_off && self.usages == 1 {
53-
self.is_disposed = true;
54-
}
5546

5647
Some(signature)
5748
}
@@ -73,7 +64,7 @@ mod tests {
7364
let expected_wif = "5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTJ";
7465

7566
let secp_k = Secp256k1PrivateKey::from_hex(priv_key_hex).unwrap();
76-
let op_signer = BurnchainOpSigner::new(secp_k, false);
67+
let op_signer = BurnchainOpSigner::new(secp_k);
7768
assert_eq!(expected_wif, &op_signer.get_sk_as_wif());
7869
}
7970

@@ -83,7 +74,7 @@ mod tests {
8374
let expected_hex = priv_key_hex;
8475

8576
let secp_k = Secp256k1PrivateKey::from_hex(priv_key_hex).unwrap();
86-
let op_signer = BurnchainOpSigner::new(secp_k, false);
77+
let op_signer = BurnchainOpSigner::new(secp_k);
8778
assert_eq!(expected_hex, op_signer.get_sk_as_hex());
8879
}
8980

@@ -93,7 +84,7 @@ mod tests {
9384
let expected_hex = "04d0de0aaeaefad02b8bdc8a01a1b8b11c696bd3d66a2c5f10780d95b7df42645cd85228a6fb29940e858e7e55842ae2bd115d1ed7cc0e82d934e929c97648cb0a";
9485

9586
let secp_k = Secp256k1PrivateKey::from_hex(priv_key_hex).unwrap();
96-
let mut op_signer = BurnchainOpSigner::new(secp_k, false);
87+
let mut op_signer = BurnchainOpSigner::new(secp_k);
9788
assert_eq!(expected_hex, op_signer.get_public_key().to_hex());
9889
}
9990

@@ -104,7 +95,7 @@ mod tests {
10495
let expected_msg_sig = "00b911e6cf9c49b738c4a0f5e33c003fa5b74a00ddc68e574e9f1c3504f6ba7e84275fd62773978cc8165f345cc3f691cf68be274213d552e79af39998df61273f";
10596

10697
let secp_k = Secp256k1PrivateKey::from_hex(priv_key_hex).unwrap();
107-
let mut op_signer = BurnchainOpSigner::new(secp_k, false);
98+
let mut op_signer = BurnchainOpSigner::new(secp_k);
10899

109100
let msg_sig = op_signer.sign_message(message)
110101
.expect("Message should be signed!");
@@ -118,7 +109,7 @@ mod tests {
118109
let message = &[0u8; 20];
119110

120111
let secp_k = Secp256k1PrivateKey::from_hex(priv_key_hex).unwrap();
121-
let mut op_signer = BurnchainOpSigner::new(secp_k, false);
112+
let mut op_signer = BurnchainOpSigner::new(secp_k);
122113

123114
let result = op_signer.sign_message(message);
124115
assert!(result.is_none());
@@ -130,7 +121,7 @@ mod tests {
130121
let message = &[0u8; 32];
131122

132123
let secp_k = Secp256k1PrivateKey::from_hex(priv_key_hex).unwrap();
133-
let mut op_signer = BurnchainOpSigner::new(secp_k, false);
124+
let mut op_signer = BurnchainOpSigner::new(secp_k);
134125

135126
op_signer.dispose();
136127

‎testnet/stacks-node/src/tests/epoch_21.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ fn transition_fixes_bitcoin_rigidity() {
697697
burn_header_hash: BurnchainHeaderHash([0u8; 32]),
698698
};
699699

700-
let mut spender_signer = BurnchainOpSigner::new(spender_sk, false);
700+
let mut spender_signer = BurnchainOpSigner::new(spender_sk);
701701

702702
assert!(
703703
btc_regtest_controller
@@ -849,7 +849,7 @@ fn transition_fixes_bitcoin_rigidity() {
849849
burn_header_hash: BurnchainHeaderHash([0u8; 32]),
850850
};
851851

852-
let mut spender_signer = BurnchainOpSigner::new(spender_sk, false);
852+
let mut spender_signer = BurnchainOpSigner::new(spender_sk);
853853

854854
assert!(
855855
btc_regtest_controller
@@ -923,7 +923,7 @@ fn transition_fixes_bitcoin_rigidity() {
923923
burn_header_hash: BurnchainHeaderHash([0u8; 32]),
924924
};
925925

926-
let mut spender_signer = BurnchainOpSigner::new(spender_2_sk, false);
926+
let mut spender_signer = BurnchainOpSigner::new(spender_2_sk);
927927

928928
btc_regtest_controller
929929
.submit_manual(
@@ -989,7 +989,7 @@ fn transition_fixes_bitcoin_rigidity() {
989989
burn_header_hash: BurnchainHeaderHash([0u8; 32]),
990990
};
991991

992-
let mut spender_signer = BurnchainOpSigner::new(spender_2_sk, false);
992+
let mut spender_signer = BurnchainOpSigner::new(spender_2_sk);
993993

994994
btc_regtest_controller
995995
.submit_manual(

‎testnet/stacks-node/src/tests/nakamoto_integrations.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3552,7 +3552,7 @@ fn vote_for_aggregate_key_burn_op() {
35523552
burn_header_hash: BurnchainHeaderHash::zero(),
35533553
});
35543554

3555-
let mut signer_burnop_signer = BurnchainOpSigner::new(signer_sk, false);
3555+
let mut signer_burnop_signer = BurnchainOpSigner::new(signer_sk);
35563556
assert!(
35573557
btc_regtest_controller
35583558
.submit_operation(
@@ -4738,10 +4738,10 @@ fn burn_ops_integration_test() {
47384738
"reward_cycle" => reward_cycle,
47394739
);
47404740

4741-
let mut signer_burnop_signer_1 = BurnchainOpSigner::new(signer_sk_1, false);
4742-
let mut signer_burnop_signer_2 = BurnchainOpSigner::new(signer_sk_2, false);
4743-
let mut stacker_burnop_signer_1 = BurnchainOpSigner::new(stacker_sk_1, false);
4744-
let mut stacker_burnop_signer_2 = BurnchainOpSigner::new(stacker_sk_2, false);
4741+
let mut signer_burnop_signer_1 = BurnchainOpSigner::new(signer_sk_1);
4742+
let mut signer_burnop_signer_2 = BurnchainOpSigner::new(signer_sk_2);
4743+
let mut stacker_burnop_signer_1 = BurnchainOpSigner::new(stacker_sk_1);
4744+
let mut stacker_burnop_signer_2 = BurnchainOpSigner::new(stacker_sk_2);
47454745

47464746
info!(
47474747
"Before stack-stx op, signer 1 total: {}",

‎testnet/stacks-node/src/tests/neon_integrations.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,7 +2019,7 @@ fn stx_transfer_btc_integration_test() {
20192019
burn_header_hash: BurnchainHeaderHash([0u8; 32]),
20202020
};
20212021

2022-
let mut spender_signer = BurnchainOpSigner::new(spender_sk, false);
2022+
let mut spender_signer = BurnchainOpSigner::new(spender_sk);
20232023

20242024
assert!(
20252025
btc_regtest_controller
@@ -2090,7 +2090,7 @@ fn stx_transfer_btc_integration_test() {
20902090
burn_header_hash: BurnchainHeaderHash([0u8; 32]),
20912091
};
20922092

2093-
let mut spender_signer = BurnchainOpSigner::new(spender_2_sk, false);
2093+
let mut spender_signer = BurnchainOpSigner::new(spender_2_sk);
20942094

20952095
btc_regtest_controller
20962096
.submit_manual(
@@ -2288,7 +2288,7 @@ fn stx_delegate_btc_integration_test() {
22882288
until_burn_height: None,
22892289
};
22902290

2291-
let mut spender_signer = BurnchainOpSigner::new(spender_sk, false);
2291+
let mut spender_signer = BurnchainOpSigner::new(spender_sk);
22922292
assert!(
22932293
btc_regtest_controller
22942294
.submit_operation(
@@ -2656,7 +2656,7 @@ fn stack_stx_burn_op_test() {
26562656
burn_header_hash: BurnchainHeaderHash::zero(),
26572657
});
26582658

2659-
let mut spender_signer_1 = BurnchainOpSigner::new(signer_sk_1, false);
2659+
let mut spender_signer_1 = BurnchainOpSigner::new(signer_sk_1);
26602660
assert!(
26612661
btc_regtest_controller
26622662
.submit_operation(
@@ -2684,7 +2684,7 @@ fn stack_stx_burn_op_test() {
26842684
burn_header_hash: BurnchainHeaderHash::zero(),
26852685
});
26862686

2687-
let mut spender_signer_2 = BurnchainOpSigner::new(signer_sk_2, false);
2687+
let mut spender_signer_2 = BurnchainOpSigner::new(signer_sk_2);
26882688
assert!(
26892689
btc_regtest_controller
26902690
.submit_operation(
@@ -3041,7 +3041,7 @@ fn vote_for_aggregate_key_burn_op_test() {
30413041
burn_header_hash: BurnchainHeaderHash::zero(),
30423042
});
30433043

3044-
let mut spender_signer = BurnchainOpSigner::new(signer_sk, false);
3044+
let mut spender_signer = BurnchainOpSigner::new(signer_sk);
30453045
assert!(
30463046
btc_regtest_controller
30473047
.submit_operation(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3601,7 +3601,7 @@ fn tx_replay_btc_on_stx_invalidation() {
36013601
let num_signers = 5;
36023602
let sender_sk = Secp256k1PrivateKey::from_seed("sender_1".as_bytes());
36033603
let sender_addr = tests::to_addr(&sender_sk);
3604-
let mut sender_burnop_signer = BurnchainOpSigner::new(sender_sk, false);
3604+
let mut sender_burnop_signer = BurnchainOpSigner::new(sender_sk);
36053605
let send_amt = 100;
36063606
let send_fee = 180;
36073607
let recipient_sk = Secp256k1PrivateKey::from_seed("recipient_1".as_bytes());

0 commit comments

Comments
 (0)