Fix conflicts

paritytech · Dec 10, 2024 · ce36ae7 · ce36ae7
1 parent f1a12e9
commit ce36ae7
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 222 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bridges/chains/chain-asset-hub-rococo/Cargo.toml b/bridges/chains/chain-asset-hub-rococo/Cargo.toml
@@ -16,21 +16,10 @@ workspace = true
 [dependencies]
 codec = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-<<<<<<< HEAD
 frame-support.workspace = true
+sp-core.workspace = true
 bp-xcm-bridge-hub-router.workspace = true
-=======
-
-# Substrate Dependencies
-frame-support = { workspace = true }
-sp-core = { workspace = true }
-
-# Bridge Dependencies
-bp-xcm-bridge-hub-router = { workspace = true }
->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781))
-
-# Polkadot dependencies
-xcm = { workspace = true }
+xcm.workspace = true
 
 [features]
 default = ["std"]

diff --git a/bridges/chains/chain-asset-hub-rococo/src/lib.rs b/bridges/chains/chain-asset-hub-rococo/src/lib.rs
@@ -57,7 +57,7 @@ pub fn build_congestion_message<RuntimeCall>(
 		UnpaidExecution { weight_limit: Unlimited, check_origin: None },
 		Transact {
 			origin_kind: OriginKind::Xcm,
-			fallback_max_weight: Some(XcmBridgeHubRouterTransactCallMaxWeight::get()),
+			require_weight_at_most: XcmBridgeHubRouterTransactCallMaxWeight::get(),
 			call: Call::ToWestendXcmRouter(XcmBridgeHubRouterCall::report_bridge_status {
 				bridge_id,
 				is_congested,

diff --git a/bridges/chains/chain-asset-hub-westend/Cargo.toml b/bridges/chains/chain-asset-hub-westend/Cargo.toml
@@ -16,21 +16,10 @@ workspace = true
 [dependencies]
 codec = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-<<<<<<< HEAD
 frame-support.workspace = true
+sp-core.workspace = true
 bp-xcm-bridge-hub-router.workspace = true
-=======
-
-# Substrate Dependencies
-frame-support = { workspace = true }
-sp-core = { workspace = true }
-
-# Bridge Dependencies
-bp-xcm-bridge-hub-router = { workspace = true }
->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781))
-
-# Polkadot dependencies
-xcm = { workspace = true }
+xcm.workspace = true
 
 [features]
 default = ["std"]

diff --git a/bridges/chains/chain-asset-hub-westend/src/lib.rs b/bridges/chains/chain-asset-hub-westend/src/lib.rs
@@ -57,7 +57,7 @@ pub fn build_congestion_message<RuntimeCall>(
 		UnpaidExecution { weight_limit: Unlimited, check_origin: None },
 		Transact {
 			origin_kind: OriginKind::Xcm,
-			fallback_max_weight: Some(XcmBridgeHubRouterTransactCallMaxWeight::get()),
+			require_weight_at_most: XcmBridgeHubRouterTransactCallMaxWeight::get(),
 			call: Call::ToRococoXcmRouter(XcmBridgeHubRouterCall::report_bridge_status {
 				bridge_id,
 				is_congested,

diff --git a/bridges/modules/xcm-bridge-hub/Cargo.toml b/bridges/modules/xcm-bridge-hub/Cargo.toml
@@ -28,22 +28,13 @@ xcm-builder.workspace = true
 xcm-executor.workspace = true
 
 [dev-dependencies]
-<<<<<<< HEAD
-pallet-balances = { path = "../../../substrate/frame/balances", default-features = false }
-sp-io = { path = "../../../substrate/primitives/io", default-features = false }
-bp-runtime = { path = "../../primitives/runtime", default-features = false }
-bp-header-chain = { path = "../../primitives/header-chain", default-features = false }
-pallet-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
-polkadot-parachain-primitives = { path = "../../../polkadot/parachain", default-features = false }
-=======
 pallet-balances = { workspace = true }
 sp-io = { workspace = true }
 bp-runtime = { workspace = true }
 bp-header-chain = { workspace = true }
 pallet-xcm-bridge-hub-router = { workspace = true }
 bp-xcm-bridge-hub-router = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781))
 
 [features]
 default = ["std"]

diff --git a/bridges/modules/xcm-bridge-hub/src/mock.rs b/bridges/modules/xcm-bridge-hub/src/mock.rs
@@ -483,7 +483,7 @@ impl TestLocalXcmChannelManager {
 			UnpaidExecution { weight_limit: Unlimited, check_origin: None },
 			Transact {
 				origin_kind: OriginKind::Xcm,
-				fallback_max_weight: None,
+				require_weight_at_most: frame_support::weights::Weight::from_parts(200_000_000, 6144),
 				call: Call::XcmOverBridgeWrappedWithExportMessageRouter(
 					XcmBridgeHubRouterCall::report_bridge_status {
 						bridge_id: bridge.inner(),

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
@@ -24,18 +24,10 @@ use asset_hub_rococo_runtime::{
 		ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger, ForeignCreatorsSovereignAccountOf,
 		LocationToAccountId, StakingPot, TokenLocation, TrustBackedAssetsPalletLocation, XcmConfig,
 	},
-<<<<<<< HEAD
 	AllPalletsWithoutSystem, AssetConversion, AssetDeposit, Assets, Balances, CollatorSelection,
 	ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, MetadataDepositBase,
 	MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
-	SessionKeys, TrustBackedAssetsInstance, XcmpQueue,
-=======
-	AllPalletsWithoutSystem, AssetConversion, AssetDeposit, Assets, Balances, Block,
-	CollatorSelection, ExistentialDeposit, ForeignAssets, ForeignAssetsInstance,
-	MetadataDepositBase, MetadataDepositPerByte, ParachainSystem, Runtime, RuntimeCall,
-	RuntimeEvent, RuntimeOrigin, SessionKeys, ToWestendXcmRouterInstance,
-	TrustBackedAssetsInstance, XcmpQueue,
->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781))
+	SessionKeys, ToWestendXcmRouterInstance, TrustBackedAssetsInstance, XcmpQueue,
 };
 use asset_test_utils::{
 	test_cases_over_bridge::TestBridgingConfig, CollatorSessionKey, CollatorSessionKeys,

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -46,13 +46,8 @@ use frame_support::{
 	traits::{
 		fungible, fungibles,
 		tokens::{imbalance::ResolveAssetTo, nonfungibles_v2::Inspect},
-<<<<<<< HEAD
-		AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, InstanceFilter,
-		TransformOrigin,
-=======
 		AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, Equals,
-		InstanceFilter, Nothing, TransformOrigin,
->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781))
+		InstanceFilter, TransformOrigin,
 	},
 	weights::{ConstantMultiplier, Weight, WeightToFee as _},
 	BoundedVec, PalletId,
@@ -63,11 +58,7 @@ use frame_system::{
 };
 use pallet_asset_conversion_tx_payment::SwapAssetAdapter;
 use pallet_nfts::{DestroyWitness, PalletFeatures};
-<<<<<<< HEAD
-=======
-use pallet_revive::{evm::runtime::EthExtra, AddressMapper};
 use pallet_xcm::EnsureXcm;
->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781))
 use parachains_common::{
 	impls::DealWithFees, message_queue::*, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance,
 	BlockNumber, CollectionId, Hash, Header, ItemId, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -77,7 +77,6 @@ pallet-collator-selection.workspace = true
 parachain-info.workspace = true
 parachains-common.workspace = true
 testnet-parachains-constants = { features = ["rococo"], workspace = true }
-<<<<<<< HEAD
 bp-asset-hub-rococo.workspace = true
 bp-asset-hub-westend.workspace = true
 bp-bridge-hub-polkadot.workspace = true
@@ -92,6 +91,7 @@ bp-relayers.workspace = true
 bp-runtime.workspace = true
 bp-rococo.workspace = true
 bp-westend.workspace = true
+bp-xcm-bridge-hub-router.workspace = true
 pallet-bridge-grandpa.workspace = true
 pallet-bridge-messages.workspace = true
 pallet-bridge-parachains.workspace = true
@@ -109,45 +109,6 @@ snowbridge-outbound-queue-runtime-api.workspace = true
 snowbridge-router-primitives.workspace = true
 snowbridge-runtime-common.workspace = true
 bridge-hub-common.workspace = true
-=======
-
-# Bridges
-bp-asset-hub-rococo = { workspace = true }
-bp-asset-hub-westend = { workspace = true }
-bp-bridge-hub-polkadot = { workspace = true }
-bp-bridge-hub-rococo = { workspace = true }
-bp-bridge-hub-westend = { workspace = true }
-bp-header-chain = { workspace = true }
-bp-messages = { workspace = true }
-bp-parachains = { workspace = true }
-bp-polkadot-bulletin = { workspace = true }
-bp-polkadot-core = { workspace = true }
-bp-relayers = { workspace = true }
-bp-runtime = { workspace = true }
-bp-rococo = { workspace = true }
-bp-westend = { workspace = true }
-bp-xcm-bridge-hub-router = { workspace = true }
-pallet-bridge-grandpa = { workspace = true }
-pallet-bridge-messages = { workspace = true }
-pallet-bridge-parachains = { workspace = true }
-pallet-bridge-relayers = { workspace = true }
-pallet-xcm-bridge-hub = { workspace = true }
-bridge-runtime-common = { workspace = true }
-
-# Ethereum Bridge (Snowbridge)
-snowbridge-beacon-primitives = { workspace = true }
-snowbridge-pallet-system = { workspace = true }
-snowbridge-system-runtime-api = { workspace = true }
-snowbridge-core = { workspace = true }
-snowbridge-pallet-ethereum-client = { workspace = true }
-snowbridge-pallet-inbound-queue = { workspace = true }
-snowbridge-pallet-outbound-queue = { workspace = true }
-snowbridge-outbound-queue-runtime-api = { workspace = true }
-snowbridge-router-primitives = { workspace = true }
-snowbridge-runtime-common = { workspace = true }
-
-bridge-hub-common = { workspace = true }
->>>>>>> 8f4b99cf (Bridges - revert-back congestion mechanism (#6781))
 
 [dev-dependencies]
 bridge-hub-test-utils = { default-features = true, path = "../test-utils" }