unrelated changes

Snowfork · Nov 28, 2023 · 0a1b2a3 · 0a1b2a3
1 parent c10b7a3
commit 0a1b2a3
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 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
@@ -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
@@ -3406,7 +3406,6 @@ impl<T: Config> Pallet<T> {
 
 		// 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(())