diff --git a/Cargo.lock b/Cargo.lock index 600e72915e..c74ee26837 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4858,8 +4858,10 @@ dependencies = [ [[package]] name = "node-inspect" version = "0.8.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#1b758b2a8d151d97d2242260c465b6df9cb8a7a4" dependencies = [ "derive_more", + "log", "parity-scale-codec", "sc-cli", "sc-client-api", @@ -4873,10 +4875,8 @@ dependencies = [ [[package]] name = "node-inspect" version = "0.8.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.8#1b758b2a8d151d97d2242260c465b6df9cb8a7a4" dependencies = [ "derive_more", - "log", "parity-scale-codec", "sc-cli", "sc-client-api", diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs index 59310026e9..6c27fb7aa5 100644 --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -94,7 +94,7 @@ fn load_spec( #[cfg(not(feature = "with-bifrost-runtime"))] return Err("Bifrost runtime is not available. Please compile the node with `--features with-bifrost-runtime` to enable it.".into()); } - } + }, }) } @@ -273,7 +273,7 @@ pub fn run() -> Result<()> { .await .map_err(Into::into) }) - } + }, Some(Subcommand::Inspect(cmd)) => { let runner = cli.create_runner(cmd)?; @@ -289,8 +289,8 @@ pub fn run() -> Result<()> { config, ); }); - } - Some(Subcommand::Benchmark(cmd)) => { + }, + Some(Subcommand::Benchmark(cmd)) => if cfg!(feature = "runtime-benchmarks") { let runner = cli.create_runner(cmd)?; @@ -306,8 +306,7 @@ pub fn run() -> Result<()> { Err("Benchmarking wasn't enabled when building the node. \ You can enable it with `--features runtime-benchmarks`." .into()) - } - } + }, Some(Subcommand::Key(cmd)) => cmd.run(&cli), Some(Subcommand::Sign(cmd)) => cmd.run(), Some(Subcommand::Verify(cmd)) => cmd.run(), @@ -315,27 +314,27 @@ pub fn run() -> Result<()> { Some(Subcommand::BuildSpec(cmd)) => { let runner = cli.create_runner(cmd)?; runner.sync_run(|config| cmd.run(config.chain_spec, config.network)) - } + }, Some(Subcommand::CheckBlock(cmd)) => { construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, components.import_queue)) }) - } + }, Some(Subcommand::ExportBlocks(cmd)) => { construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, config.database)) }) - } + }, Some(Subcommand::ExportState(cmd)) => { construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, config.chain_spec)) }) - } + }, Some(Subcommand::ImportBlocks(cmd)) => { construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, components.import_queue)) }) - } + }, Some(Subcommand::PurgeChain(cmd)) => { let runner = cli.create_runner(cmd)?; @@ -356,12 +355,12 @@ pub fn run() -> Result<()> { cmd.run(config, polkadot_config) }) - } + }, Some(Subcommand::Revert(cmd)) => { construct_async_run!(|components, cli, cmd, config| { Ok(cmd.run(components.client, components.backend)) }) - } + }, Some(Subcommand::ExportGenesisState(params)) => { let mut builder = sc_cli::LoggerBuilder::new(""); builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); @@ -385,7 +384,7 @@ pub fn run() -> Result<()> { } Ok(()) - } + }, Some(Subcommand::ExportGenesisWasm(params)) => { let mut builder = sc_cli::LoggerBuilder::new(""); builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); @@ -406,7 +405,7 @@ pub fn run() -> Result<()> { } Ok(()) - } + }, } } diff --git a/node/inspect/src/command.rs b/node/inspect/src/command.rs index 37acc554a5..6525245fc2 100644 --- a/node/inspect/src/command.rs +++ b/node/inspect/src/command.rs @@ -47,13 +47,13 @@ impl InspectCmd { let res = inspect.block(input).map_err(|e| format!("{}", e))?; println!("{}", res); Ok(()) - } + }, InspectSubCmd::Extrinsic { input } => { let input = input.parse()?; let res = inspect.extrinsic(input).map_err(|e| format!("{}", e))?; println!("{}", res); Ok(()) - } + }, } } } diff --git a/node/inspect/src/lib.rs b/node/inspect/src/lib.rs index ec378885dc..da66ac14d3 100644 --- a/node/inspect/src/lib.rs +++ b/node/inspect/src/lib.rs @@ -156,7 +156,7 @@ impl> Inspector let header = self.chain.header(id)?.ok_or_else(|| Error::NotFound(not_found.clone()))?; TBlock::new(header, body) - } + }, BlockAddress::Hash(hash) => { let id = BlockId::hash(hash); let not_found = format!("Could not find block {:?}", id); @@ -167,7 +167,7 @@ impl> Inspector let header = self.chain.header(id)?.ok_or_else(|| Error::NotFound(not_found.clone()))?; TBlock::new(header, body) - } + }, }) } @@ -192,7 +192,7 @@ impl> Inspector index, block )) })? - } + }, ExtrinsicAddress::Bytes(bytes) => TBlock::Extrinsic::decode(&mut &*bytes)?, }; diff --git a/pallets/bancor/src/lib.rs b/pallets/bancor/src/lib.rs index 1f27d04a8c..dd1b873038 100644 --- a/pallets/bancor/src/lib.rs +++ b/pallets/bancor/src/lib.rs @@ -368,7 +368,7 @@ impl Pallet { pool_info.token_ceiling = pool_info.token_ceiling.saturating_add(increase_amount); Ok(()) - } + }, _ => Err(Error::::BancorPoolNotExist), } })?; @@ -392,7 +392,7 @@ impl Pallet { pool_info.token_pool = pool_info.token_pool.saturating_sub(token_amount); pool_info.vstoken_pool = pool_info.vstoken_pool.saturating_sub(vstoken_amount); Ok(()) - } + }, _ => Err(Error::::BancorPoolNotExist), } })?; @@ -416,7 +416,7 @@ impl Pallet { pool_info.token_pool = pool_info.token_pool.saturating_add(token_amount); pool_info.vstoken_pool = pool_info.vstoken_pool.saturating_add(vstoken_amount); Ok(()) - } + }, _ => Err(Error::::BancorPoolNotExist), } })?; diff --git a/pallets/bid/src/lib.rs b/pallets/bid/src/lib.rs index 6f9d80abeb..db11fac589 100644 --- a/pallets/bid/src/lib.rs +++ b/pallets/bid/src/lib.rs @@ -777,11 +777,10 @@ impl Module { balance_order_vec.binary_search_by_key(&annual_roi, |(roi, _odr_id)| roi); match index_wrapped { - Ok(index) | Err(index) => { + Ok(index) | Err(index) => if index < (T::TokenOrderROIListLength::get() as usize) { balance_order_vec.insert(index, (*annual_roi, new_order_id)); - } - } + }, } if balance_order_vec.len() > (T::TokenOrderROIListLength::get() as usize) { diff --git a/pallets/salp/src/tests.rs b/pallets/salp/src/tests.rs index 02d721c31d..ce10ef36e5 100644 --- a/pallets/salp/src/tests.rs +++ b/pallets/salp/src/tests.rs @@ -992,7 +992,7 @@ fn dissolve_should_work() { let contribute_account_num = remove_times * RemoveKeysLimit::get(); assert_ok!(Salp::create(Some(ALICE).into(), 3_000, 10_000, 1, SlotLength::get())); - for i in 0 .. contribute_account_num { + for i in 0..contribute_account_num { let ract = AccountId::new([(i as u8); 32]); assert_ok!(Salp::contribute(Some(ract.clone()).into(), 3_000, 10)); assert_ok!(Salp::confirm_contribute(Some(ALICE).into(), ract, 3_000, true)); @@ -1005,7 +1005,7 @@ fn dissolve_should_work() { assert_eq!(Salp::redeem_pool(), (10 * contribute_account_num) as u128); - for _ in 0 .. remove_times { + for _ in 0..remove_times { assert_ok!(Salp::dissolve(Some(ALICE).into(), 3_000)); } @@ -1397,7 +1397,7 @@ fn release_from_redeem_to_bancor_should_work() { #[test] fn check_next_trie_index() { new_test_ext().execute_with(|| { - for i in 0 .. 100 { + for i in 0..100 { assert_eq!(Salp::current_trie_index(), i); assert_ok!(Salp::next_trie_index()); } diff --git a/pallets/vesting/src/benchmarking.rs b/pallets/vesting/src/benchmarking.rs index 42aced5e94..b03daf47d9 100644 --- a/pallets/vesting/src/benchmarking.rs +++ b/pallets/vesting/src/benchmarking.rs @@ -33,7 +33,7 @@ type BalanceOf = <::Currency as Currency<::AccountId>>::Balance; fn add_locks(who: &T::AccountId, n: u8) { - for id in 0 .. n { + for id in 0..n { let lock_id = [id; 8]; let locked = 100u32; let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE; diff --git a/pallets/vsbond-auction/src/lib.rs b/pallets/vsbond-auction/src/lib.rs index f4ed04ec52..5e7378f233 100644 --- a/pallets/vsbond-auction/src/lib.rs +++ b/pallets/vsbond-auction/src/lib.rs @@ -231,7 +231,7 @@ pub mod pallet { Some(list) => { list.insert(order_id); Ok(()) - } + }, None => Err(Error::::Unexpected), })?; @@ -277,7 +277,7 @@ pub mod pallet { Some(list) => { list.remove(&order_id); Ok(()) - } + }, None => Err(Error::::Unexpected), })?; if !RevokedOrderIds::::contains_key(&from) { @@ -287,7 +287,7 @@ pub mod pallet { Some(list) => { list.insert(order_id); Ok(()) - } + }, None => Err(Error::::Unexpected), })?; @@ -392,7 +392,7 @@ pub mod pallet { Some(list) => { list.remove(&order_id); Ok(()) - } + }, None => Err(Error::::Unexpected), }, )?; @@ -408,7 +408,7 @@ pub mod pallet { Some(list) => { list.insert(order_id); Ok(()) - } + }, None => Err(Error::::Unexpected), }, )?; diff --git a/pallets/vsbond-auction/src/tests.rs b/pallets/vsbond-auction/src/tests.rs index a0fcb66895..1e257928cd 100644 --- a/pallets/vsbond-auction/src/tests.rs +++ b/pallets/vsbond-auction/src/tests.rs @@ -111,7 +111,7 @@ fn create_order_without_enough_vsbond_should_fail() { #[test] fn create_order_exceed_maximum_order_in_trade_should_fail() { new_test_ext().execute_with(|| { - for _ in 0 .. MaximumOrderInTrade::get() { + for _ in 0..MaximumOrderInTrade::get() { assert_ok!(Auction::create_order(Some(ALICE).into(), 3000, 13, 20, 1, 1.to_fixed())); } diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs index 8a21167517..21d1179f19 100644 --- a/runtime/asgard/src/lib.rs +++ b/runtime/asgard/src/lib.rs @@ -320,7 +320,7 @@ impl InstanceFilter for ProxyType { ), ProxyType::CancelProxy => { matches!(c, Call::Proxy(pallet_proxy::Call::reject_announcement(..))) - } + }, } } diff --git a/runtime/common/src/xcm_impl.rs b/runtime/common/src/xcm_impl.rs index 1c1dd51381..ffb48e1349 100644 --- a/runtime/common/src/xcm_impl.rs +++ b/runtime/common/src/xcm_impl.rs @@ -117,9 +117,8 @@ impl> Convert> for BifrostCurre use CurrencyId::Token; match id { Token(TokenSymbol::KSM) | Token(TokenSymbol::DOT) => Some(X1(Parent)), - Token(TokenSymbol::ASG) | Token(TokenSymbol::BNC) => { - Some(native_currency_location(id, T::get())) - } + Token(TokenSymbol::ASG) | Token(TokenSymbol::BNC) => + Some(native_currency_location(id, T::get())), _ => None, } } diff --git a/rustfmt.toml b/rustfmt.toml index fdca1c7270..c252e61df5 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -10,12 +10,12 @@ newline_style = "Unix" normalize_comments = true normalize_doc_attributes = true # Misc -max_width = 100 comment_width = 100 chain_width = 80 wrap_comments = true -spaces_around_ranges = true -reorder_impl_items = true +match_arm_leading_pipes = "Preserve" +match_arm_blocks = false +match_block_trailing_comma = true use_field_init_shorthand = true binop_separator = "Back" license_template_path = "HEADER-GPL3" diff --git a/xcm-support/src/lib.rs b/xcm-support/src/lib.rs index 7cb89d6fcb..9c44b02ea9 100644 --- a/xcm-support/src/lib.rs +++ b/xcm-support/src/lib.rs @@ -69,15 +69,12 @@ enum Error { impl From for XcmError { fn from(e: Error) -> Self { match e { - Error::FailedToMatchFungible => { - XcmError::FailedToTransactAsset("FailedToMatchFungible") - } - Error::AccountIdConversionFailed => { - XcmError::FailedToTransactAsset("AccountIdConversionFailed") - } - Error::CurrencyIdConversionFailed => { - XcmError::FailedToTransactAsset("CurrencyIdConversionFailed") - } + Error::FailedToMatchFungible => + XcmError::FailedToTransactAsset("FailedToMatchFungible"), + Error::AccountIdConversionFailed => + XcmError::FailedToTransactAsset("AccountIdConversionFailed"), + Error::CurrencyIdConversionFailed => + XcmError::FailedToTransactAsset("CurrencyIdConversionFailed"), } } } @@ -128,10 +125,9 @@ impl< Matcher::matches_fungible(&asset), ) { // known asset - (Ok(who), Some(currency_id), Some(amount)) => { + (Ok(who), Some(currency_id), Some(amount)) => MultiCurrency::deposit(currency_id, &who, amount) - .map_err(|e| XcmError::FailedToTransactAsset(e.into())) - } + .map_err(|e| XcmError::FailedToTransactAsset(e.into())), _ => Err(XcmError::AssetNotFound), } } diff --git a/xcm-support/src/mock.rs b/xcm-support/src/mock.rs index 3f01638e7d..f1b22696f1 100644 --- a/xcm-support/src/mock.rs +++ b/xcm-support/src/mock.rs @@ -55,7 +55,7 @@ pub fn encode_xcm(message: Xcm<()>, message_kind: MessageKind) -> Vec { let encoded = VersionedXcm::<()>::from(message).encode(); outbound.extend_from_slice(&encoded[..]); outbound - } + }, } }