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>
2026-04-26 08:47:57 +00:00 · 2021-07-21 16:32:32 +02:00
parent d451c38c1c
commit 7b56ab15b4
1010 changed files with 53339 additions and 51208 deletions
@@ -16,12 +16,13 @@
 // limitations under the License.

 use sp_api::{
-	RuntimeApiInfo, decl_runtime_apis, impl_runtime_apis, mock_impl_runtime_apis,
-	ApiError,
-	ApiExt,
+	decl_runtime_apis, impl_runtime_apis, mock_impl_runtime_apis, ApiError, ApiExt, RuntimeApiInfo,
 };
-use sp_runtime::{traits::{GetNodeBlockType, Block as BlockT}, generic::BlockId};
 use sp_core::NativeOrEncoded;
+use sp_runtime::{
+	generic::BlockId,
+	traits::{Block as BlockT, GetNodeBlockType},
+};
 use substrate_test_runtime_client::runtime::Block;

 /// The declaration of the `Runtime` type and the implementation of the `GetNodeBlockType`
@@ -142,16 +143,22 @@ type TestClient = substrate_test_runtime_client::client::Client<

 #[test]
 fn test_client_side_function_signature() {
-	let _test: fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, u64) -> Result<(), ApiError> =
-		RuntimeApiImpl::<Block, TestClient>::test;
-	let _something_with_block:
-		fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>, Block) -> Result<Block, ApiError> =
-			RuntimeApiImpl::<Block, TestClient>::something_with_block;
+	let _test: fn(
+		&RuntimeApiImpl<Block, TestClient>,
+		&BlockId<Block>,
+		u64,
+	) -> Result<(), ApiError> = RuntimeApiImpl::<Block, TestClient>::test;
+	let _something_with_block: fn(
+		&RuntimeApiImpl<Block, TestClient>,
+		&BlockId<Block>,
+		Block,
+	) -> Result<Block, ApiError> = RuntimeApiImpl::<Block, TestClient>::something_with_block;

 	#[allow(deprecated)]
-	let _same_name_before_version_2:
-		fn(&RuntimeApiImpl<Block, TestClient>, &BlockId<Block>) -> Result<String, ApiError> =
-			RuntimeApiImpl::<Block, TestClient>::same_name_before_version_2;
+	let _same_name_before_version_2: fn(
+		&RuntimeApiImpl<Block, TestClient>,
+		&BlockId<Block>,
+	) -> Result<String, ApiError> = RuntimeApiImpl::<Block, TestClient>::same_name_before_version_2;
 }

 #[test]
@@ -186,9 +193,7 @@ fn check_runtime_api_versions() {
 fn mock_runtime_api_has_api() {
 	let mock = MockApi { block: None };

-	assert!(
-		mock.has_api::<dyn ApiWithCustomVersion<Block>>(&BlockId::Number(0)).unwrap(),
-	);
+	assert!(mock.has_api::<dyn ApiWithCustomVersion<Block>>(&BlockId::Number(0)).unwrap(),);
 	assert!(mock.has_api::<dyn Api<Block>>(&BlockId::Number(0)).unwrap());
 }

@@ -15,21 +15,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use sp_api::{ProvideRuntimeApi, Core};
+use sp_api::{Core, ProvideRuntimeApi};
+use sp_runtime::{
+	generic::BlockId,
+	traits::{HashFor, Header as HeaderT},
+};
+use sp_state_machine::{
+	create_proof_check_backend, execution_proof_check_on_trie_backend, ExecutionStrategy,
+};
 use substrate_test_runtime_client::{
 	prelude::*,
+	runtime::{Block, DecodeFails, Header, TestAPI, Transfer},
 	DefaultTestClientBuilderExt, TestClientBuilder,
-	runtime::{TestAPI, DecodeFails, Transfer, Block, Header},
-};
-use sp_runtime::{generic::BlockId, traits::{Header as HeaderT, HashFor}};
-use sp_state_machine::{
-	ExecutionStrategy, create_proof_check_backend,
-	execution_proof_check_on_trie_backend,
 };

-use sp_consensus::SelectChain;
 use codec::Encode;
 use sc_block_builder::BlockBuilderProvider;
+use sp_consensus::SelectChain;

 fn calling_function_with_strat(strat: ExecutionStrategy) {
 	let client = TestClientBuilder::new().set_execution_strategy(strat).build();
@@ -52,7 +54,9 @@ fn calling_wasm_runtime_function() {
 #[test]
 #[should_panic(expected = "FailedToConvertParameter { function: \"fail_convert_parameter\"")]
 fn calling_native_runtime_function_with_non_decodable_parameter() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeWhenPossible).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeWhenPossible)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	runtime_api.fail_convert_parameter(&block_id, DecodeFails::new()).unwrap();
@@ -61,7 +65,9 @@ fn calling_native_runtime_function_with_non_decodable_parameter() {
 #[test]
 #[should_panic(expected = "FailedToConvertReturnValue { function: \"fail_convert_return_value\"")]
 fn calling_native_runtime_function_with_non_decodable_return_value() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeWhenPossible).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeWhenPossible)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	runtime_api.fail_convert_return_value(&block_id).unwrap();
@@ -69,7 +75,9 @@ fn calling_native_runtime_function_with_non_decodable_return_value() {

 #[test]
 fn calling_native_runtime_signature_changed_function() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeWhenPossible).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeWhenPossible)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);

@@ -78,7 +86,9 @@ fn calling_native_runtime_signature_changed_function() {

 #[test]
 fn calling_wasm_runtime_signature_changed_old_function() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);

@@ -103,10 +113,11 @@ fn calling_with_both_strategy_and_fail_on_native_should_work() {
 	assert_eq!(runtime_api.fail_on_native(&block_id).unwrap(), 1);
 }

-
 #[test]
 fn calling_with_native_else_wasm_and_fail_on_wasm_should_work() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeElseWasm).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeElseWasm)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	assert_eq!(runtime_api.fail_on_wasm(&block_id).unwrap(), 1);
@@ -114,7 +125,9 @@ fn calling_with_native_else_wasm_and_fail_on_wasm_should_work() {

 #[test]
 fn calling_with_native_else_wasm_and_fail_on_native_should_work() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::NativeElseWasm).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::NativeElseWasm)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	assert_eq!(runtime_api.fail_on_native(&block_id).unwrap(), 1);
@@ -122,7 +135,9 @@ fn calling_with_native_else_wasm_and_fail_on_native_should_work() {

 #[test]
 fn use_trie_function() {
-	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::AlwaysWasm).build();
+	let client = TestClientBuilder::new()
+		.set_execution_strategy(ExecutionStrategy::AlwaysWasm)
+		.build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
 	assert_eq!(runtime_api.use_trie(&block_id).unwrap(), 2);
@@ -133,10 +148,18 @@ fn initialize_block_works() {
 	let client = TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::Both).build();
 	let runtime_api = client.runtime_api();
 	let block_id = BlockId::Number(client.chain_info().best_number);
-	runtime_api.initialize_block(
-		&block_id,
-		&Header::new(1, Default::default(), Default::default(), Default::default(), Default::default()),
-	).unwrap();
+	runtime_api
+		.initialize_block(
+			&block_id,
+			&Header::new(
+				1,
+				Default::default(),
+				Default::default(),
+				Default::default(),
+				Default::default(),
+			),
+		)
+		.unwrap();
 	assert_eq!(runtime_api.get_block_number(&block_id).unwrap(), 1);
 }

@@ -165,7 +188,8 @@ fn record_proof_works() {
 		nonce: 0,
 		from: AccountKeyring::Alice.into(),
 		to: Default::default(),
-	}.into_signed_tx();
+	}
+	.into_signed_tx();

 	// Build the block and record proof
 	let mut builder = client
@@ -177,15 +201,12 @@ fn record_proof_works() {
 	let backend = create_proof_check_backend::<HashFor<Block>>(
 		storage_root,
 		proof.expect("Proof was generated"),
-	).expect("Creates proof backend.");
+	)
+	.expect("Creates proof backend.");

 	// Use the proof backend to execute `execute_block`.
 	let mut overlay = Default::default();
-	let executor = NativeExecutor::<LocalExecutor>::new(
-		WasmExecutionMethod::Interpreted,
-		None,
-		8,
-	);
+	let executor = NativeExecutor::<LocalExecutor>::new(WasmExecutionMethod::Interpreted, None, 8);
 	execution_proof_check_on_trie_backend::<_, u64, _, _>(
 		&backend,
 		&mut overlay,
@@ -194,7 +215,8 @@ fn record_proof_works() {
 		"Core_execute_block",
 		&block.encode(),
 		&runtime_code,
-	).expect("Executes block while using the proof backend");
+	)
+	.expect("Executes block while using the proof backend");
 }

 #[test]
@@ -203,7 +225,8 @@ fn call_runtime_api_with_multiple_arguments() {

 	let data = vec![1, 2, 4, 5, 6, 7, 8, 8, 10, 12];
 	let block_id = BlockId::Number(client.chain_info().best_number);
-	client.runtime_api()
+	client
+		.runtime_api()
 		.test_multiple_arguments(&block_id, data.clone(), data.clone(), data.len() as u32)
 		.unwrap();
 }
@@ -213,8 +236,8 @@ fn disable_logging_works() {
 	if std::env::var("RUN_TEST").is_ok() {
 		sp_tracing::try_init_simple();

-		let mut builder = TestClientBuilder::new()
-			.set_execution_strategy(ExecutionStrategy::AlwaysWasm);
+		let mut builder =
+			TestClientBuilder::new().set_execution_strategy(ExecutionStrategy::AlwaysWasm);
 		builder.genesis_init_mut().set_wasm_code(
 			substrate_test_runtime_client::runtime::wasm_binary_logging_disabled_unwrap().to_vec(),
 		);