Skip to content

Commit a3feee7

Browse files
jferrantjferrant
committed
Remove useless vec from MessageSignature::from_raw
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent 88dfb88 commit a3feee7

File tree

7 files changed

+67
-74
lines changed

7 files changed

+67
-74
lines changed

‎stackslib/src/burnchains/tests/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -910,10 +910,7 @@ fn verify_keys_accepted(node: &mut TestBurnchainNode, prev_keys: &[LeaderKeyRegi
910910
}
911911
}
912912

913-
fn verify_commits_accepted(
914-
node: &TestBurnchainNode,
915-
next_block_commits: &[LeaderBlockCommitOp],
916-
) {
913+
fn verify_commits_accepted(node: &TestBurnchainNode, next_block_commits: &[LeaderBlockCommitOp]) {
917914
// all commits accepted
918915
for commit in next_block_commits.iter() {
919916
let tx_opt =

‎stackslib/src/chainstate/stacks/auth.rs

Lines changed: 42 additions & 42 deletions
Large diffs are not rendered by default.

‎stackslib/src/chainstate/stacks/index/test/mod.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,7 @@ where
100100
test_debug!("----- END TRIE ------\n");
101101
}
102102

103-
pub fn merkle_test(
104-
s: &mut TrieStorageConnection<BlockHeaderHash>,
105-
path: &[u8],
106-
value: &[u8],
107-
) {
103+
pub fn merkle_test(s: &mut TrieStorageConnection<BlockHeaderHash>, path: &[u8], value: &[u8]) {
108104
let (_, root_hash) = Trie::read_root(s).unwrap();
109105
let triepath = TrieHash::from_bytes(&path[..]).unwrap();
110106

‎stackslib/src/chainstate/stacks/mod.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,24 +1165,24 @@ pub mod test {
11651165
key_encoding: TransactionPublicKeyEncoding::Uncompressed,
11661166
nonce: 123,
11671167
tx_fee: 456,
1168-
signature: MessageSignature::from_raw(&vec![0xff; 65])
1168+
signature: MessageSignature::from_raw(&[0xff; 65])
11691169
}),
11701170
TransactionSpendingCondition::Singlesig(SinglesigSpendingCondition {
11711171
signer: Hash160([0x11; 20]),
11721172
hash_mode: SinglesigHashMode::P2PKH,
11731173
key_encoding: TransactionPublicKeyEncoding::Compressed,
11741174
nonce: 234,
11751175
tx_fee: 567,
1176-
signature: MessageSignature::from_raw(&vec![0xff; 65])
1176+
signature: MessageSignature::from_raw(&[0xff; 65])
11771177
}),
11781178
TransactionSpendingCondition::Multisig(MultisigSpendingCondition {
11791179
signer: Hash160([0x11; 20]),
11801180
hash_mode: MultisigHashMode::P2SH,
11811181
nonce: 345,
11821182
tx_fee: 678,
11831183
fields: vec![
1184-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Uncompressed, MessageSignature::from_raw(&vec![0xff; 65])),
1185-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Uncompressed, MessageSignature::from_raw(&vec![0xfe; 65])),
1184+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Uncompressed, MessageSignature::from_raw(&[0xff; 65])),
1185+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Uncompressed, MessageSignature::from_raw(&[0xfe; 65])),
11861186
TransactionAuthField::PublicKey(PubKey::from_hex("04ef2340518b5867b23598a9cf74611f8b98064f7d55cdb8c107c67b5efcbc5c771f112f919b00a6c6c5f51f7c63e1762fe9fac9b66ec75a053db7f51f4a52712b").unwrap()),
11871187
],
11881188
signatures_required: 2
@@ -1193,8 +1193,8 @@ pub mod test {
11931193
nonce: 456,
11941194
tx_fee: 789,
11951195
fields: vec![
1196-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&vec![0xff; 65])),
1197-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&vec![0xfe; 65])),
1196+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&[0xff; 65])),
1197+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&[0xfe; 65])),
11981198
TransactionAuthField::PublicKey(PubKey::from_hex("03ef2340518b5867b23598a9cf74611f8b98064f7d55cdb8c107c67b5efcbc5c77").unwrap())
11991199
],
12001200
signatures_required: 2
@@ -1205,16 +1205,16 @@ pub mod test {
12051205
key_encoding: TransactionPublicKeyEncoding::Compressed,
12061206
nonce: 567,
12071207
tx_fee: 890,
1208-
signature: MessageSignature::from_raw(&vec![0xfe; 65]),
1208+
signature: MessageSignature::from_raw(&[0xfe; 65]),
12091209
}),
12101210
TransactionSpendingCondition::Multisig(MultisigSpendingCondition {
12111211
signer: Hash160([0x11; 20]),
12121212
hash_mode: MultisigHashMode::P2WSH,
12131213
nonce: 678,
12141214
tx_fee: 901,
12151215
fields: vec![
1216-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&vec![0xff; 65])),
1217-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&vec![0xfe; 65])),
1216+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&[0xff; 65])),
1217+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&[0xfe; 65])),
12181218
TransactionAuthField::PublicKey(PubKey::from_hex("03ef2340518b5867b23598a9cf74611f8b98064f7d55cdb8c107c67b5efcbc5c77").unwrap())
12191219
],
12201220
signatures_required: 2
@@ -1229,8 +1229,8 @@ pub mod test {
12291229
nonce: 678,
12301230
tx_fee: 901,
12311231
fields: vec![
1232-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&vec![0xff; 65])),
1233-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&vec![0xfe; 65])),
1232+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&[0xff; 65])),
1233+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&[0xfe; 65])),
12341234
TransactionAuthField::PublicKey(PubKey::from_hex("03ef2340518b5867b23598a9cf74611f8b98064f7d55cdb8c107c67b5efcbc5c77").unwrap())
12351235
],
12361236
signatures_required: 2
@@ -1241,8 +1241,8 @@ pub mod test {
12411241
nonce: 345,
12421242
tx_fee: 678,
12431243
fields: vec![
1244-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Uncompressed, MessageSignature::from_raw(&vec![0xff; 65])),
1245-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Uncompressed, MessageSignature::from_raw(&vec![0xfe; 65])),
1244+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Uncompressed, MessageSignature::from_raw(&[0xff; 65])),
1245+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Uncompressed, MessageSignature::from_raw(&[0xfe; 65])),
12461246
TransactionAuthField::PublicKey(PubKey::from_hex("04ef2340518b5867b23598a9cf74611f8b98064f7d55cdb8c107c67b5efcbc5c771f112f919b00a6c6c5f51f7c63e1762fe9fac9b66ec75a053db7f51f4a52712b").unwrap()),
12471247
],
12481248
signatures_required: 2
@@ -1253,8 +1253,8 @@ pub mod test {
12531253
nonce: 456,
12541254
tx_fee: 789,
12551255
fields: vec![
1256-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&vec![0xff; 65])),
1257-
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&vec![0xfe; 65])),
1256+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&[0xff; 65])),
1257+
TransactionAuthField::Signature(TransactionPublicKeyEncoding::Compressed, MessageSignature::from_raw(&[0xfe; 65])),
12581258
TransactionAuthField::PublicKey(PubKey::from_hex("03ef2340518b5867b23598a9cf74611f8b98064f7d55cdb8c107c67b5efcbc5c77").unwrap())
12591259
],
12601260
signatures_required: 2

‎stackslib/src/clarity_vm/clarity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2568,7 +2568,7 @@ mod tests {
25682568
key_encoding: TransactionPublicKeyEncoding::Compressed,
25692569
nonce: 0,
25702570
tx_fee: 1,
2571-
signature: MessageSignature::from_raw(&vec![0xfe; 65]),
2571+
signature: MessageSignature::from_raw(&[0xfe; 65]),
25722572
});
25732573

25742574
let contract = "(define-public (foo) (ok 1))";

‎stackslib/src/core/tests/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1666,7 +1666,7 @@ fn mempool_db_test_rbf() {
16661666
key_encoding: TransactionPublicKeyEncoding::Uncompressed,
16671667
nonce: 123,
16681668
tx_fee: 456,
1669-
signature: MessageSignature::from_raw(&vec![0xff; 65]),
1669+
signature: MessageSignature::from_raw(&[0xff; 65]),
16701670
});
16711671
let stx_address = StacksAddress {
16721672
version: 1,

‎stackslib/src/net/codec.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,7 @@ pub mod test {
17921792
burn_stable_block_height: 0x00001111,
17931793
burn_stable_block_hash: BurnchainHeaderHash([0x22; 32]),
17941794
additional_data: 0x33333333,
1795-
signature: MessageSignature::from_raw(&vec![0x44; 65]),
1795+
signature: MessageSignature::from_raw(&[0x44; 65]),
17961796
payload_len: 0x000007ff,
17971797
};
17981798
let preamble_bytes: Vec<u8> = vec![
@@ -2344,7 +2344,7 @@ pub mod test {
23442344
let data = StackerDBChunkData {
23452345
slot_id: 2,
23462346
slot_version: 3,
2347-
sig: MessageSignature::from_raw(&vec![0x44; 65]),
2347+
sig: MessageSignature::from_raw(&[0x44; 65]),
23482348
data: vec![
23492349
0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
23502350
],
@@ -2371,7 +2371,7 @@ pub mod test {
23712371
let data = StackerDBChunkData {
23722372
slot_id: 2,
23732373
slot_version: 3,
2374-
sig: MessageSignature::from_raw(&vec![0x44; 65]),
2374+
sig: MessageSignature::from_raw(&[0x44; 65]),
23752375
data: vec![
23762376
0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
23772377
],
@@ -2636,7 +2636,7 @@ pub mod test {
26362636
StacksMessageType::StackerDBChunk(StackerDBChunkData {
26372637
slot_id: 2,
26382638
slot_version: 3,
2639-
sig: MessageSignature::from_raw(&vec![0x44; 65]),
2639+
sig: MessageSignature::from_raw(&[0x44; 65]),
26402640
data: vec![0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff]
26412641
}),
26422642
StacksMessageType::StackerDBPushChunk(StackerDBPushChunkData {
@@ -2645,7 +2645,7 @@ pub mod test {
26452645
chunk_data: StackerDBChunkData {
26462646
slot_id: 2,
26472647
slot_version: 3,
2648-
sig: MessageSignature::from_raw(&vec![0x44; 65]),
2648+
sig: MessageSignature::from_raw(&[0x44; 65]),
26492649
data: vec![0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff]
26502650
}
26512651
}),
@@ -2734,7 +2734,7 @@ pub mod test {
27342734
burn_stable_block_height: 0x00001111,
27352735
burn_stable_block_hash: BurnchainHeaderHash([0x22; 32]),
27362736
additional_data: 0x33333333,
2737-
signature: MessageSignature::from_raw(&vec![0x44; 65]),
2737+
signature: MessageSignature::from_raw(&[0x44; 65]),
27382738
payload_len: (relayers_bytes.len() + payload_bytes.len()) as u32,
27392739
};
27402740

0 commit comments

Comments
 (0)