fix: formatting

Author: JoeCap08055

pallets/msa/src/benchmarking.rs

@@ -373,8 +373,7 @@ mod benchmarks {
 	fn withdraw_tokens() -> Result<(), BenchmarkError> {
 		prep_signature_registry::<T>();
 
-		let (msa_public_key, msa_key_pair, msa_id) =
-			create_msa_account_and_keys::<T>();
+		let (msa_public_key, msa_key_pair, msa_id) = create_msa_account_and_keys::<T>();
 
 		let eth_account_id: H160 = Msa::<T>::msa_id_to_eth_address(msa_id);
 		let mut bytes = &EthereumAddressMapper::to_bytes32(&eth_account_id.0)[..];
@@ -386,13 +385,11 @@ mod benchmarks {
 		T::Currency::set_balance(&msa_account_id, balance);
 		assert_eq!(T::Currency::balance(&msa_account_id), balance);
 
-		let (add_key_payload, _, new_account_id) =
-			add_key_payload_and_signature::<T>(msa_id);
+		let (add_key_payload, _, new_account_id) = add_key_payload_and_signature::<T>(msa_id);
 
 		let encoded_add_key_payload = wrap_binary_data(add_key_payload.encode());
-		let owner_signature = MultiSignature::Sr25519(
-			msa_key_pair.sign(&encoded_add_key_payload).unwrap().into(),
-		);
+		let owner_signature =
+			MultiSignature::Sr25519(msa_key_pair.sign(&encoded_add_key_payload).unwrap().into());
 
 		#[extrinsic_call]
 		_(
@@ -406,7 +403,6 @@ mod benchmarks {
 		Ok(())
 	}
 
-
 	impl_benchmark_test_suite!(
 		Msa,
 		crate::tests::mock::new_test_ext_keystore(),

pallets/msa/src/tests/msa_token_tests.rs

@@ -1,34 +1,38 @@
 use frame_support::{
 	assert_noop, assert_ok,
-	traits::{Currency, tokens::{Fortitude, Preservation, fungible::Inspect}},
+	traits::{
+		tokens::{fungible::Inspect, Fortitude, Preservation},
+		Currency,
+	},
 };
 
 use sp_core::{sr25519, Encode, Pair};
-use sp_runtime::{MultiSignature};
+use sp_runtime::MultiSignature;
 
-use crate::{
-	tests::mock::*,
-	types::AddKeyData,
-	Config, Error,
-};
+use crate::{tests::mock::*, types::AddKeyData, Config, Error};
 
 use common_primitives::{
-	msa::{H160, MessageSourceId},
+	msa::{MessageSourceId, H160},
 	node::BlockNumber,
 	signatures::{AccountAddressMapper, EthereumAddressMapper},
 	utils::wrap_binary_data,
 };
 
 use pallet_balances::Event as BalancesEvent;
 
-fn generate_payload(msa_id: MessageSourceId, msa_owner_keys: &sr25519::Pair, new_public_key: &sr25519::Pair, expiration: Option<BlockNumber>) ->  (AddKeyData::<Test>, Vec<u8>, MultiSignature) {
+fn generate_payload(
+	msa_id: MessageSourceId,
+	msa_owner_keys: &sr25519::Pair,
+	new_public_key: &sr25519::Pair,
+	expiration: Option<BlockNumber>,
+) -> (AddKeyData<Test>, Vec<u8>, MultiSignature) {
 	let payload = AddKeyData::<Test> {
 		msa_id,
 		expiration: match expiration {
 			Some(block_number) => block_number,
-			None => 10
+			None => 10,
 		},
-		new_public_key: new_public_key.public().into()
+		new_public_key: new_public_key.public().into(),
 	};
 
 	let encoded_payload = wrap_binary_data(payload.encode());
@@ -44,7 +48,8 @@ fn it_fails_when_caller_key_does_not_match_payload() {
 		let (origin_key_pair, _) = sr25519::Pair::generate();
 		let (other_key_pair, _) = sr25519::Pair::generate();
 
-		let (payload, _, msa_signature) = generate_payload(msa_id, &owner_key_pair, &other_key_pair, None);
+		let (payload, _, msa_signature) =
+			generate_payload(msa_id, &owner_key_pair, &other_key_pair, None);
 
 		assert_noop!(
 			Msa::withdraw_tokens(
@@ -65,7 +70,8 @@ fn it_fails_when_payload_signature_is_invalid() {
 		let (origin_key_pair, _) = sr25519::Pair::generate();
 		let (other_key_pair, _) = sr25519::Pair::generate();
 
-		let (payload, _, msa_signature) = generate_payload(msa_id, &other_key_pair, &origin_key_pair, None);
+		let (payload, _, msa_signature) =
+			generate_payload(msa_id, &other_key_pair, &origin_key_pair, None);
 
 		assert_noop!(
 			Msa::withdraw_tokens(
@@ -87,7 +93,8 @@ fn it_fails_when_proof_is_expired() {
 
 		// The current block is 1, therefore setting the proof expiration to 1 should cause
 		// the extrinsic to fail because the proof has expired.
-		let (payload, _, msa_signature) = generate_payload(msa_id, &owner_key_pair, &origin_key_pair, Some(1));
+		let (payload, _, msa_signature) =
+			generate_payload(msa_id, &owner_key_pair, &origin_key_pair, Some(1));
 
 		assert_noop!(
 			Msa::withdraw_tokens(
@@ -109,7 +116,12 @@ fn it_fails_when_proof_is_not_yet_valid() {
 
 		// The current block is 1, therefore setting the proof expiration to the max mortality period
 		// should cause the extrinsic to fail
-		let (payload, _, msa_signature) = generate_payload(msa_id, &owner_key_pair, &origin_key_pair, Some(Msa::mortality_block_limit(1)));
+		let (payload, _, msa_signature) = generate_payload(
+			msa_id,
+			&owner_key_pair,
+			&origin_key_pair,
+			Some(Msa::mortality_block_limit(1)),
+		);
 
 		assert_noop!(
 			Msa::withdraw_tokens(
@@ -129,7 +141,8 @@ fn it_fails_when_msa_key_is_not_an_msa_control_key() {
 		let (msa_id, owner_key_pair) = create_account();
 		let (origin_key_pair, _) = sr25519::Pair::generate();
 
-		let (payload, _, msa_signature) = generate_payload(msa_id + 1, &owner_key_pair, &origin_key_pair, None);
+		let (payload, _, msa_signature) =
+			generate_payload(msa_id + 1, &owner_key_pair, &origin_key_pair, None);
 
 		assert_noop!(
 			Msa::withdraw_tokens(
@@ -150,7 +163,8 @@ fn it_fails_when_msa_key_does_not_control_msa_in_payload() {
 		let (origin_key_pair, _) = sr25519::Pair::generate();
 		let (other_key_pair, _) = sr25519::Pair::generate();
 
-		let (payload, _, msa_signature) = generate_payload(msa_id, &other_key_pair, &origin_key_pair, None);
+		let (payload, _, msa_signature) =
+			generate_payload(msa_id, &other_key_pair, &origin_key_pair, None);
 
 		assert_noop!(
 			Msa::withdraw_tokens(
@@ -170,7 +184,8 @@ fn it_fails_when_msa_does_not_have_a_balance() {
 		let (msa_id, owner_key_pair) = create_account();
 		let (origin_key_pair, _) = sr25519::Pair::generate();
 
-		let (payload, _, msa_signature) = generate_payload(msa_id, &owner_key_pair, &origin_key_pair, None);
+		let (payload, _, msa_signature) =
+			generate_payload(msa_id, &owner_key_pair, &origin_key_pair, None);
 
 		assert_noop!(
 			Msa::withdraw_tokens(
@@ -193,31 +208,36 @@ fn it_succeeds_when_balance_is_sufficient() {
 		let bytes: [u8; 32] = EthereumAddressMapper::to_bytes32(&eth_account_id.0);
 		let msa_account_id = <Test as frame_system::Config>::AccountId::from(bytes);
 
-		let (payload, _, msa_signature) = generate_payload(msa_id, &owner_key_pair, &origin_key_pair, None);
+		let (payload, _, msa_signature) =
+			generate_payload(msa_id, &owner_key_pair, &origin_key_pair, None);
 
 		let transfer_amount = 10_000_000;
 
 		// Fund MSA
 		let _ = <Test as Config>::Currency::deposit_creating(&msa_account_id, transfer_amount);
 
-		assert_ok!(
-			Msa::withdraw_tokens(
-				RuntimeOrigin::signed(origin_key_pair.public().into()),
-				owner_key_pair.public().into(),
-				msa_signature,
-				payload
-			)
-		);
+		assert_ok!(Msa::withdraw_tokens(
+			RuntimeOrigin::signed(origin_key_pair.public().into()),
+			owner_key_pair.public().into(),
+			msa_signature,
+			payload
+		));
 
 		let receiver_balance = <Test as Config>::Currency::reducible_balance(
 			&origin_key_pair.public().into(),
 			Preservation::Expendable,
-			Fortitude::Polite
+			Fortitude::Polite,
 		);
-		assert_eq!(receiver_balance, transfer_amount, "transfer amount {} does not equal new balance {}", transfer_amount, receiver_balance);
-
-		System::assert_last_event(
-			RuntimeEvent::Balances(BalancesEvent::Transfer { from: msa_account_id, to: origin_key_pair.public().into(), amount: transfer_amount }),
+		assert_eq!(
+			receiver_balance, transfer_amount,
+			"transfer amount {} does not equal new balance {}",
+			transfer_amount, receiver_balance
 		);
+
+		System::assert_last_event(RuntimeEvent::Balances(BalancesEvent::Transfer {
+			from: msa_account_id,
+			to: origin_key_pair.public().into(),
+			amount: transfer_amount,
+		}));
 	})
 }