From 0a1b2a3d116b3d48079e6c9f71149d04ab60fdcc Mon Sep 17 00:00:00 2001 From: Alistair Singh Date: Tue, 28 Nov 2023 12:47:30 +0200 Subject: [PATCH] unrelated changes --- .../bridge_hub_westend_local_network.toml | 108 +++++++++--------- substrate/frame/nomination-pools/src/lib.rs | 1 - 2 files changed, 54 insertions(+), 55 deletions(-) diff --git a/cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml b/cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml index 19ed8fd757a9..1919d1c63f25 100644 --- a/cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml +++ b/cumulus/zombienet/bridge-hubs/bridge_hub_westend_local_network.toml @@ -6,76 +6,76 @@ default_command = "{{POLKADOT_BINARY_PATH}}" default_args = [ "-lparachain=debug,xcm=trace" ] chain = "westend-local" -[[relaychain.nodes]] -name = "alice-westend-validator" -validator = true -rpc_port = 9935 -ws_port = 9945 -balance = 2000000000000 + [[relaychain.nodes]] + name = "alice-westend-validator" + validator = true + rpc_port = 9935 + ws_port = 9945 + balance = 2000000000000 -[[relaychain.nodes]] -name = "bob-westend-validator" -validator = true -rpc_port = 9936 -ws_port = 9946 -balance = 2000000000000 + [[relaychain.nodes]] + name = "bob-westend-validator" + validator = true + rpc_port = 9936 + ws_port = 9946 + balance = 2000000000000 -[[relaychain.nodes]] -name = "charlie-westend-validator" -validator = true -rpc_port = 9937 -ws_port = 9947 -balance = 2000000000000 + [[relaychain.nodes]] + name = "charlie-westend-validator" + validator = true + rpc_port = 9937 + ws_port = 9947 + balance = 2000000000000 [[parachains]] id = 1002 chain = "bridge-hub-westend-local" cumulus_based = true -# run alice as parachain collator -[[parachains.collators]] -name = "bridge-hub-westend-collator1" -validator = true -command = "{{POLKADOT_PARACHAIN_BINARY_PATH}}" -rpc_port = 8935 -ws_port = 8945 -args = [ - "-lparachain=debug,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace", - "--force-authoring" -] + # run alice as parachain collator + [[parachains.collators]] + name = "bridge-hub-westend-collator1" + validator = true + command = "{{POLKADOT_PARACHAIN_BINARY_PATH}}" + rpc_port = 8935 + ws_port = 8945 + args = [ + "-lparachain=debug,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace", + "--force-authoring" + ] -# run bob as parachain collator -[[parachains.collators]] -name = "bridge-hub-westend-collator2" -validator = true -command = "{{POLKADOT_PARACHAIN_BINARY_PATH}}" -rpc_port = 8936 -ws_port = 8946 -args = [ - "-lparachain=trace,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace", - "--force-authoring" -] + # run bob as parachain collator + [[parachains.collators]] + name = "bridge-hub-westend-collator2" + validator = true + command = "{{POLKADOT_PARACHAIN_BINARY_PATH}}" + rpc_port = 8936 + ws_port = 8946 + args = [ + "-lparachain=trace,runtime::mmr=info,substrate=info,runtime=info,runtime::bridge-hub=trace,runtime::bridge=trace,runtime::bridge-dispatch=trace,bridge=trace,runtime::bridge-messages=trace,xcm=trace", + "--force-authoring" + ] [[parachains]] id = 1000 chain = "asset-hub-westend-local" cumulus_based = true -[[parachains.collators]] -name = "asset-hub-westend-collator1" -rpc_port = 9011 -ws_port = 9010 -command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND}}" -args = [ - "-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace" -] + [[parachains.collators]] + name = "asset-hub-westend-collator1" + rpc_port = 9011 + ws_port = 9010 + command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND}}" + args = [ + "-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace" + ] -[[parachains.collators]] -name = "asset-hub-westend-collator2" -command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND}}" -args = [ - "-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace" -] + [[parachains.collators]] + name = "asset-hub-westend-collator2" + command = "{{POLKADOT_PARACHAIN_BINARY_PATH_FOR_ASSET_HUB_WESTEND}}" + args = [ + "-lparachain=debug,xcm=trace,runtime::bridge-transfer=trace" + ] #[[hrmp_channels]] #sender = 1000 diff --git a/substrate/frame/nomination-pools/src/lib.rs b/substrate/frame/nomination-pools/src/lib.rs index 8d78ff546a39..909a930e3821 100644 --- a/substrate/frame/nomination-pools/src/lib.rs +++ b/substrate/frame/nomination-pools/src/lib.rs @@ -3406,7 +3406,6 @@ impl Pallet { // Warn if any pool has incorrect ED frozen. We don't want to fail hard as this could be a // result of an intentional ED change. - #[cfg(any(feature = "try-runtime", feature = "runtime-benchmarks", test, debug_assertions))] let _ = Self::check_ed_imbalance()?; Ok(())