Run cargo fmt on the whole code base (#9394)

* Run cargo fmt on the whole code base

* Second run

* Add CI check

* Fix compilation

* More unnecessary braces

* Handle weights

* Use --all

* Use correct attributes...

* Fix UI tests

* AHHHHHHHHH

* 🤦

* Docs

* Fix compilation

* 🤷

* Please stop

* 🤦 x 2

* More

* make rustfmt.toml consistent with polkadot

Co-authored-by: André Silva <andrerfosilva@gmail.com>
This commit is contained in:
Bastian Köcher
2021-07-21 16:32:32 +02:00
committed by GitHub
parent d451c38c1c
commit 7b56ab15b4
1010 changed files with 53339 additions and 51208 deletions
@@ -15,18 +15,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::*;
use crate::mock::*;
use crate::{mock::*, *};
use frame_support::traits::OnInitialize;
use pallet_mmr_primitives::{Compact, Proof};
use sp_core::{
offchain::{testing::TestOffchainExt, OffchainDbExt, OffchainWorkerExt},
H256,
offchain::{
testing::TestOffchainExt,
OffchainWorkerExt, OffchainDbExt,
},
};
use pallet_mmr_primitives::{Proof, Compact};
pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
@@ -58,13 +54,12 @@ pub(crate) fn hex(s: &str) -> H256 {
type BlockNumber = <Test as frame_system::Config>::BlockNumber;
fn decode_node(v: Vec<u8>) -> mmr::Node<
<Test as Config>::Hashing,
((BlockNumber, H256), LeafData),
> {
fn decode_node(
v: Vec<u8>,
) -> mmr::Node<<Test as Config>::Hashing, ((BlockNumber, H256), LeafData)> {
use crate::primitives::DataOrHash;
type A = DataOrHash::<<Test as Config>::Hashing, (BlockNumber, H256)>;
type B = DataOrHash::<<Test as Config>::Hashing, LeafData>;
type A = DataOrHash<<Test as Config>::Hashing, (BlockNumber, H256)>;
type B = DataOrHash<<Test as Config>::Hashing, LeafData>;
type Node = mmr::Node<<Test as Config>::Hashing, (A, B)>;
let tuple: Node = codec::Decode::decode(&mut &v[..]).unwrap();
@@ -89,7 +84,9 @@ fn should_start_empty() {
// given
assert_eq!(
crate::RootHash::<Test>::get(),
"0000000000000000000000000000000000000000000000000000000000000000".parse().unwrap()
"0000000000000000000000000000000000000000000000000000000000000000"
.parse()
.unwrap()
);
assert_eq!(crate::NumberOfLeaves::<Test>::get(), 0);
assert_eq!(crate::Nodes::<Test>::get(0), None);
@@ -99,8 +96,10 @@ fn should_start_empty() {
// then
assert_eq!(crate::NumberOfLeaves::<Test>::get(), 1);
assert_eq!(crate::Nodes::<Test>::get(0),
Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")));
assert_eq!(
crate::Nodes::<Test>::get(0),
Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0"))
);
assert_eq!(
crate::RootHash::<Test>::get(),
hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")
@@ -120,35 +119,41 @@ fn should_append_to_mmr_when_on_initialize_is_called() {
// then
assert_eq!(crate::NumberOfLeaves::<Test>::get(), 2);
assert_eq!((
crate::Nodes::<Test>::get(0),
crate::Nodes::<Test>::get(1),
crate::Nodes::<Test>::get(2),
crate::Nodes::<Test>::get(3),
crate::RootHash::<Test>::get(),
), (
Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
Some(hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705")),
Some(hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854")),
None,
hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854"),
));
assert_eq!(
(
crate::Nodes::<Test>::get(0),
crate::Nodes::<Test>::get(1),
crate::Nodes::<Test>::get(2),
crate::Nodes::<Test>::get(3),
crate::RootHash::<Test>::get(),
),
(
Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
Some(hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705")),
Some(hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854")),
None,
hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854"),
)
);
});
// make sure the leaves end up in the offchain DB
ext.persist_offchain_overlay();
let offchain_db = ext.offchain_db();
assert_eq!(offchain_db.get(&MMR::offchain_key(0)).map(decode_node), Some(mmr::Node::Data((
(0, H256::repeat_byte(1)),
LeafData::new(1),
))));
assert_eq!(offchain_db.get(&MMR::offchain_key(1)).map(decode_node), Some(mmr::Node::Data((
(1, H256::repeat_byte(2)),
LeafData::new(2),
))));
assert_eq!(offchain_db.get(&MMR::offchain_key(2)).map(decode_node), Some(mmr::Node::Hash(
hex("672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854")
)));
assert_eq!(
offchain_db.get(&MMR::offchain_key(0)).map(decode_node),
Some(mmr::Node::Data(((0, H256::repeat_byte(1)), LeafData::new(1),)))
);
assert_eq!(
offchain_db.get(&MMR::offchain_key(1)).map(decode_node),
Some(mmr::Node::Data(((1, H256::repeat_byte(2)), LeafData::new(2),)))
);
assert_eq!(
offchain_db.get(&MMR::offchain_key(2)).map(decode_node),
Some(mmr::Node::Hash(hex(
"672c04a9cd05a644789d769daa552d35d8de7c33129f8a7cbf49e595234c4854"
)))
);
assert_eq!(offchain_db.get(&MMR::offchain_key(3)), None);
}
@@ -161,15 +166,18 @@ fn should_construct_larger_mmr_correctly() {
// then
assert_eq!(crate::NumberOfLeaves::<Test>::get(), 7);
assert_eq!((
crate::Nodes::<Test>::get(0),
crate::Nodes::<Test>::get(10),
crate::RootHash::<Test>::get(),
), (
Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
Some(hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c")),
hex("e45e25259f7930626431347fa4dd9aae7ac83b4966126d425ca70ab343709d2c"),
));
assert_eq!(
(
crate::Nodes::<Test>::get(0),
crate::Nodes::<Test>::get(10),
crate::RootHash::<Test>::get(),
),
(
Some(hex("4320435e8c3318562dba60116bdbcc0b82ffcecb9bb39aae3300cfda3ad0b8b0")),
Some(hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c")),
hex("e45e25259f7930626431347fa4dd9aae7ac83b4966126d425ca70ab343709d2c"),
)
);
});
}
@@ -192,41 +200,50 @@ fn should_generate_proofs_correctly() {
.collect::<Vec<_>>();
// then
assert_eq!(proofs[0], (Compact::new((
(0, H256::repeat_byte(1)).into(),
LeafData::new(1).into(),
)), Proof {
leaf_index: 0,
leaf_count: 7,
items: vec![
hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705"),
hex("cb24f4614ad5b2a5430344c99545b421d9af83c46fd632d70a332200884b4d46"),
hex("dca421199bdcc55bb773c6b6967e8d16675de69062b52285ca63685241fdf626"),
],
}));
assert_eq!(proofs[4], (Compact::new((
(4, H256::repeat_byte(5)).into(),
LeafData::new(5).into(),
)), Proof {
leaf_index: 4,
leaf_count: 7,
items: vec![
hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
hex("8ed25570209d8f753d02df07c1884ddb36a3d9d4770e4608b188322151c657fe"),
hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c"),
],
}));
assert_eq!(proofs[6], (Compact::new((
(6, H256::repeat_byte(7)).into(),
LeafData::new(7).into(),
)), Proof {
leaf_index: 6,
leaf_count: 7,
items: vec![
hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
hex("7e4316ae2ebf7c3b6821cb3a46ca8b7a4f9351a9b40fcf014bb0a4fd8e8f29da"),
],
}));
assert_eq!(
proofs[0],
(
Compact::new(((0, H256::repeat_byte(1)).into(), LeafData::new(1).into(),)),
Proof {
leaf_index: 0,
leaf_count: 7,
items: vec![
hex("ad4cbc033833612ccd4626d5f023b9dfc50a35e838514dd1f3c86f8506728705"),
hex("cb24f4614ad5b2a5430344c99545b421d9af83c46fd632d70a332200884b4d46"),
hex("dca421199bdcc55bb773c6b6967e8d16675de69062b52285ca63685241fdf626"),
],
}
)
);
assert_eq!(
proofs[4],
(
Compact::new(((4, H256::repeat_byte(5)).into(), LeafData::new(5).into(),)),
Proof {
leaf_index: 4,
leaf_count: 7,
items: vec![
hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
hex("8ed25570209d8f753d02df07c1884ddb36a3d9d4770e4608b188322151c657fe"),
hex("611c2174c6164952a66d985cfe1ec1a623794393e3acff96b136d198f37a648c"),
],
}
)
);
assert_eq!(
proofs[6],
(
Compact::new(((6, H256::repeat_byte(7)).into(), LeafData::new(7).into(),)),
Proof {
leaf_index: 6,
leaf_count: 7,
items: vec![
hex("ae88a0825da50e953e7a359c55fe13c8015e48d03d301b8bdfc9193874da9252"),
hex("7e4316ae2ebf7c3b6821cb3a46ca8b7a4f9351a9b40fcf014bb0a4fd8e8f29da"),
],
}
)
);
});
}
@@ -280,7 +297,10 @@ fn verification_should_be_stateless() {
// Verify proof without relying on any on-chain data.
let leaf = crate::primitives::DataOrHash::Data(leaf);
assert_eq!(crate::verify_leaf_proof::<<Test as Config>::Hashing, _>(root, leaf, proof5), Ok(()));
assert_eq!(
crate::verify_leaf_proof::<<Test as Config>::Hashing, _>(root, leaf, proof5),
Ok(())
);
}
#[test]