Skip to content

Commit a27c8b6

Browse files
authored
chore: test lint (#769)
~So that we can enable the `"-Wclippy::tests_outside_test_module"` flag. Thanks @Ad96el for this.......~ I ignored the lint for pallets using the v1 benchmarking macros, and for our emulated tests.
1 parent e86f9fb commit a27c8b6

File tree

24 files changed

+692
-610
lines changed

24 files changed

+692
-610
lines changed

.cargo/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ rustflags = [
3333
"-Wclippy::ref_patterns",
3434
"-Wclippy::rest_pat_in_fully_bound_structs",
3535
"-Wclippy::suspicious_operation_groupings",
36+
"-Wclippy::tests_outside_test_module",
3637
"-Wclippy::type_repetition_in_bounds",
3738
"-Wclippy::unnecessary_self_imports",
3839
"-Wclippy::unnecessary_struct_initialization",

crates/kilt-dip-primitives/src/merkle_proofs/v0/error.rs

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,31 @@ impl From<Error> for u8 {
6464
}
6565
}
6666

67-
#[test]
68-
fn error_value_never_zero() {
69-
assert!(
70-
enum_iterator::all::<Error>().all(|e| u8::from(e) != 0),
71-
"One of the u8 values for the error is 0, which is not allowed."
72-
);
73-
}
67+
#[cfg(test)]
68+
mod tests {
69+
use super::*;
70+
71+
#[test]
72+
fn error_value_never_zero() {
73+
assert!(
74+
enum_iterator::all::<Error>().all(|e| u8::from(e) != 0),
75+
"One of the u8 values for the error is 0, which is not allowed."
76+
);
77+
}
7478

75-
#[test]
76-
fn error_value_not_duplicated() {
77-
enum_iterator::all::<Error>().fold(
78-
sp_std::collections::btree_set::BTreeSet::<u8>::new(),
79-
|mut values, new_value| {
80-
let new_encoded_value = u8::from(new_value);
81-
assert!(
82-
values.insert(new_encoded_value),
83-
"Failed to add unique value {:#?} for error variant",
84-
new_encoded_value
85-
);
86-
values
87-
},
88-
);
79+
#[test]
80+
fn error_value_not_duplicated() {
81+
enum_iterator::all::<Error>().fold(
82+
sp_std::collections::btree_set::BTreeSet::<u8>::new(),
83+
|mut values, new_value| {
84+
let new_encoded_value = u8::from(new_value);
85+
assert!(
86+
values.insert(new_encoded_value),
87+
"Failed to add unique value {:#?} for error variant",
88+
new_encoded_value
89+
);
90+
values
91+
},
92+
);
93+
}
8994
}

crates/kilt-dip-primitives/src/state_proofs/error.rs

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,31 @@ impl From<MerkleProofError> for u8 {
4040
}
4141
}
4242

43-
#[test]
44-
fn merkle_proof_error_value_never_zero() {
45-
assert!(
46-
enum_iterator::all::<MerkleProofError>().all(|e| u8::from(e) != 0),
47-
"One of the u8 values for the error is 0, which is not allowed."
48-
);
49-
}
43+
#[cfg(test)]
44+
mod tests {
45+
use super::*;
46+
47+
#[test]
48+
fn merkle_proof_error_value_never_zero() {
49+
assert!(
50+
enum_iterator::all::<MerkleProofError>().all(|e| u8::from(e) != 0),
51+
"One of the u8 values for the error is 0, which is not allowed."
52+
);
53+
}
5054

51-
#[test]
52-
fn merkle_proof_error_value_not_duplicated() {
53-
enum_iterator::all::<MerkleProofError>().fold(
54-
sp_std::collections::btree_set::BTreeSet::<u8>::new(),
55-
|mut values, new_value| {
56-
let new_encoded_value = u8::from(new_value);
57-
assert!(
58-
values.insert(new_encoded_value),
59-
"Failed to add unique value {:#?} for error variant",
60-
new_encoded_value
61-
);
62-
values
63-
},
64-
);
55+
#[test]
56+
fn merkle_proof_error_value_not_duplicated() {
57+
enum_iterator::all::<MerkleProofError>().fold(
58+
sp_std::collections::btree_set::BTreeSet::<u8>::new(),
59+
|mut values, new_value| {
60+
let new_encoded_value = u8::from(new_value);
61+
assert!(
62+
values.insert(new_encoded_value),
63+
"Failed to add unique value {:#?} for error variant",
64+
new_encoded_value
65+
);
66+
values
67+
},
68+
);
69+
}
6570
}

crates/kilt-dip-primitives/src/utils.rs

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,30 @@ mod calculate_parachain_head_storage_key {
3535
)
3636
}
3737

38-
#[test]
39-
fn calculate_parachain_head_storage_key_successful_spiritnet_parachain() {
40-
assert_eq!(
41-
calculate_parachain_head_storage_key(2_086).0,
42-
hex_literal::hex!(
43-
"cd710b30bd2eab0352ddcc26417aa1941b3c252fcb29d88eff4f3de5de4476c32c0cfd6c23b92a7826080000"
44-
)
45-
.to_vec()
46-
);
47-
}
48-
#[test]
49-
fn calculate_parachain_head_storage_key_successful_peregrine_parachain() {
50-
assert_eq!(
51-
calculate_parachain_head_storage_key(2_000).0,
52-
hex_literal::hex!(
53-
"cd710b30bd2eab0352ddcc26417aa1941b3c252fcb29d88eff4f3de5de4476c363f5a4efb16ffa83d0070000"
54-
)
55-
.to_vec()
56-
);
38+
#[cfg(test)]
39+
mod tests {
40+
use super::*;
41+
42+
#[test]
43+
fn calculate_parachain_head_storage_key_successful_spiritnet_parachain() {
44+
assert_eq!(
45+
calculate_parachain_head_storage_key(2_086).0,
46+
hex_literal::hex!(
47+
"cd710b30bd2eab0352ddcc26417aa1941b3c252fcb29d88eff4f3de5de4476c32c0cfd6c23b92a7826080000"
48+
)
49+
.to_vec()
50+
);
51+
}
52+
#[test]
53+
fn calculate_parachain_head_storage_key_successful_peregrine_parachain() {
54+
assert_eq!(
55+
calculate_parachain_head_storage_key(2_000).0,
56+
hex_literal::hex!(
57+
"cd710b30bd2eab0352ddcc26417aa1941b3c252fcb29d88eff4f3de5de4476c363f5a4efb16ffa83d0070000"
58+
)
59+
.to_vec()
60+
);
61+
}
5762
}
5863
}
5964

@@ -74,16 +79,21 @@ mod calculate_dip_identity_commitment_storage_key_for_runtime {
7479
))
7580
}
7681

77-
#[test]
78-
fn calculate_dip_identity_commitment_storage_key_for_runtime_successful_peregrine_parachain() {
79-
use did::DidIdentifierOf;
80-
use peregrine_runtime::Runtime as PeregrineRuntime;
81-
use sp_core::crypto::Ss58Codec;
82+
#[cfg(test)]
83+
mod tests {
84+
use super::*;
85+
86+
#[test]
87+
fn calculate_dip_identity_commitment_storage_key_for_runtime_successful_peregrine_parachain() {
88+
use did::DidIdentifierOf;
89+
use peregrine_runtime::Runtime as PeregrineRuntime;
90+
use sp_core::crypto::Ss58Codec;
8291

83-
assert_eq!(
92+
assert_eq!(
8493
calculate_dip_identity_commitment_storage_key_for_runtime::<PeregrineRuntime>(&DidIdentifierOf::<PeregrineRuntime>::from_ss58check("4s3jpR7pzrUdhVUqHHdWoBN6oNQHBC7WRo7zsXdjAzQPT7Cf").unwrap(), 0).0,
8594
hex_literal::hex!("b375edf06348b4330d1e88564111cb3d5bf19e4ed2927982e234d989e812f3f314c9211b34c8b43b2a18d67d5c96de9cb6caebbe9e3adeaaf693a2d198f2881d0b504fc72ed4ac0a7ed24a025fc228ce01a12dfa1fa4ab9a0000")
8695
.to_vec()
8796
);
97+
}
8898
}
8999
}

crates/kilt-dip-primitives/src/verifier/parachain/error.rs

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,36 @@ where
5353
}
5454
}
5555

56-
#[test]
57-
fn dip_parachain_state_proof_verifier_error_value_never_zero() {
58-
assert!(
59-
enum_iterator::all::<DipParachainStateProofVerifierError<u8>>().all(|e| u16::from(e) != 0),
60-
"One of the u8 values for the error is 0, which is not allowed."
61-
);
62-
}
56+
#[cfg(test)]
57+
mod tests {
58+
use super::*;
6359

64-
#[test]
65-
fn dip_parachain_state_proof_verifier_error_value_not_duplicated() {
66-
enum_iterator::all::<DipParachainStateProofVerifierError<u8>>().fold(
67-
sp_std::collections::btree_set::BTreeSet::<u16>::new(),
68-
|mut values, new_value| {
69-
let new_encoded_value = u16::from(new_value);
70-
// DidOriginError is generic, and we cannot test its constraints in this unit
71-
// test, so we skip it.
72-
if new_encoded_value == u8::MAX as u16 * 3 {
73-
return values;
74-
}
75-
assert!(
76-
values.insert(new_encoded_value),
77-
"Failed to add unique value {:#?} for error variant",
78-
new_encoded_value
79-
);
80-
values
81-
},
82-
);
60+
#[test]
61+
fn dip_parachain_state_proof_verifier_error_value_never_zero() {
62+
assert!(
63+
enum_iterator::all::<DipParachainStateProofVerifierError<u8>>().all(|e| u16::from(e) != 0),
64+
"One of the u8 values for the error is 0, which is not allowed."
65+
);
66+
}
67+
68+
#[test]
69+
fn dip_parachain_state_proof_verifier_error_value_not_duplicated() {
70+
enum_iterator::all::<DipParachainStateProofVerifierError<u8>>().fold(
71+
sp_std::collections::btree_set::BTreeSet::<u16>::new(),
72+
|mut values, new_value| {
73+
let new_encoded_value = u16::from(new_value);
74+
// DidOriginError is generic, and we cannot test its constraints in this unit
75+
// test, so we skip it.
76+
if new_encoded_value == u8::MAX as u16 * 3 {
77+
return values;
78+
}
79+
assert!(
80+
values.insert(new_encoded_value),
81+
"Failed to add unique value {:#?} for error variant",
82+
new_encoded_value
83+
);
84+
values
85+
},
86+
);
87+
}
8388
}

crates/kilt-dip-primitives/src/verifier/relaychain/error.rs

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,36 @@ where
5353
}
5454
}
5555

56-
#[test]
57-
fn dip_relaychain_state_proof_verifier_error_value_never_zero() {
58-
assert!(
59-
enum_iterator::all::<DipRelaychainStateProofVerifierError<u8>>().all(|e| u16::from(e) != 0),
60-
"One of the u8 values for the error is 0, which is not allowed."
61-
);
62-
}
56+
#[cfg(test)]
57+
mod tests {
58+
use super::*;
6359

64-
#[test]
65-
fn dip_relaychain_state_proof_verifier_error_value_not_duplicated() {
66-
enum_iterator::all::<DipRelaychainStateProofVerifierError<u8>>().fold(
67-
sp_std::collections::btree_set::BTreeSet::<u16>::new(),
68-
|mut values, new_value| {
69-
let new_encoded_value = u16::from(new_value);
70-
// DidOriginError is generic, and we cannot test its constraints in this unit
71-
// test, so we skip it.
72-
if new_encoded_value == u8::MAX as u16 * 3 {
73-
return values;
74-
}
75-
assert!(
76-
values.insert(new_encoded_value),
77-
"Failed to add unique value {:#?} for error variant",
78-
new_encoded_value
79-
);
80-
values
81-
},
82-
);
60+
#[test]
61+
fn dip_relaychain_state_proof_verifier_error_value_never_zero() {
62+
assert!(
63+
enum_iterator::all::<DipRelaychainStateProofVerifierError<u8>>().all(|e| u16::from(e) != 0),
64+
"One of the u8 values for the error is 0, which is not allowed."
65+
);
66+
}
67+
68+
#[test]
69+
fn dip_relaychain_state_proof_verifier_error_value_not_duplicated() {
70+
enum_iterator::all::<DipRelaychainStateProofVerifierError<u8>>().fold(
71+
sp_std::collections::btree_set::BTreeSet::<u16>::new(),
72+
|mut values, new_value| {
73+
let new_encoded_value = u16::from(new_value);
74+
// DidOriginError is generic, and we cannot test its constraints in this unit
75+
// test, so we skip it.
76+
if new_encoded_value == u8::MAX as u16 * 3 {
77+
return values;
78+
}
79+
assert!(
80+
values.insert(new_encoded_value),
81+
"Failed to add unique value {:#?} for error variant",
82+
new_encoded_value
83+
);
84+
values
85+
},
86+
);
87+
}
8388
}

0 commit comments

Comments
 (0)