P 990 benchmark fix (#3014)

* chore: add missing benchmark feature * feat: relocate bridge and its trait * feat: fix bridge related benchmark * debug: lock file * debug: lock file * chore: typo * chore: typo * chore: rename pallet source * chore: lock file * debug: missing dependency * debug: lock file * chore * debug: missing dev * debug: not update lock dependency for specific task * debug: fix test * chore * debug: fix test * debug: fix benchmark * debug: fix benchmark * debug: add benchmark helper * debug: fix trait * debug: make AssetId type public * debug: benckmark * chore * chore: proper import * chore * debug * chore: remove unused method * chore: fmt * debug: add proper feature * chore: clippy * debug: add dev std feature for runtime * chore: lock file * debug: try solve * debug: stupid no std requriement! * feat: add cumulus fix for 0.9.43 * chore: add cumulus fix in runtime * chore * Fix pallet-bridge-transfer benchmarking (#3028) * rename folders * fix bridge-transfer benchmarking * fix clippy * [benchmarking bot] Auto commit generated weights files (#3029) Co-authored-by: Kailai-Wang <[email protected]> * enable weights --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Kailai-Wang <[email protected]> * chore: rename method * chore: add back whitelist helper * chore: rename pallet * Update benchmarking.rs Signed-off-by: WMQ <[email protected]> * chore: cleanup * chore: fmt * Update benchmarking.rs Signed-off-by: WMQ <[email protected]> --------- Signed-off-by: WMQ <[email protected]> Co-authored-by: Kai <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Kailai-Wang <[email protected]>
litentry · Aug 29, 2024 · 2eea020 · 2eea020
1 parent 9e893a2
commit 2eea020
Show file tree

Hide file tree

Showing 79 changed files with 4,677 additions and 4,043 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,10 +3,11 @@ resolver = "2"
 members = [
     'node',
     'pallets/account-fix',
-    'pallets/assets-handler',
     'pallets/bitacross',
-    'pallets/bridge',
-    'pallets/bridge-transfer',
+    'pallets/bridge/assets-handler',
+    'pallets/bridge/chain-bridge',
+    'pallets/bridge/bridge-transfer',
+    'pallets/bridge/common',
     'pallets/extrinsic-filter',
     'pallets/evm-address',
     'pallets/evm-assertions',
@@ -252,10 +253,11 @@ litentry-parachain-runtime = { path = "runtime/litentry", default-features = fal
 rococo-parachain-runtime = { path = "runtime/rococo", default-features = false }
 pallet-account-fix = { path = "pallets/account-fix", default-features = false }
 pallet-asset-manager = { path = "pallets/xcm-asset-manager", default-features = false }
-pallet-assets-handler = { path = "pallets/assets-handler", default-features = false }
+pallet-assets-handler = { path = "pallets/bridge/assets-handler", default-features = false }
 pallet-bitacross = { path = "pallets/bitacross", default-features = false }
-pallet-bridge = { path = "pallets/bridge", default-features = false }
-pallet-bridge-transfer = { path = "pallets/bridge-transfer", default-features = false }
+pallet-chain-bridge = { path = "pallets/bridge/chain-bridge", default-features = false }
+pallet-bridge-common = { path = "pallets/bridge/common", default-features = false }
+pallet-bridge-transfer = { path = "pallets/bridge/bridge-transfer", default-features = false }
 pallet-extrinsic-filter = { path = "pallets/extrinsic-filter", default-features = false }
 pallet-group = { path = "pallets/group", default-features = false }
 pallet-identity-management = { path = "pallets/identity-management", default-features = false }

diff --git a/pallets/bridge-transfer/src/benchmarking.rs b/pallets/bridge-transfer/src/benchmarking.rs
diff --git a/pallets/bridge-transfer/src/weights.rs b/pallets/bridge-transfer/src/weights.rs
diff --git a/pallets/assets-handler/Cargo.toml → pallets/bridge/assets-handler/Cargo.toml b/pallets/assets-handler/Cargo.toml → pallets/bridge/assets-handler/Cargo.toml
@@ -17,22 +17,25 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-assets = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-bridge = { workspace = true }
-pallet-bridge-transfer = { workspace = true }
+pallet-bridge-common = { workspace = true }
+pallet-chain-bridge = { workspace = true }
 pallet-parachain-staking = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
+[dev-dependencies]
+pallet-bridge-transfer = { workspace = true, features = ["std"] }
+
 [features]
 default = ["std"]
 runtime-benchmarks = [
     "frame-support/runtime-benchmarks",
     "frame-system/runtime-benchmarks",
     "pallet-assets/runtime-benchmarks",
-    "pallet-bridge/runtime-benchmarks",
-    "pallet-bridge-transfer/runtime-benchmarks",
+    "pallet-chain-bridge/runtime-benchmarks",
+    "pallet-bridge-common/runtime-benchmarks",
     "pallet-parachain-staking/runtime-benchmarks",
 ]
 std = [
@@ -46,8 +49,8 @@ std = [
     "frame-system/std",
     "pallet-assets/std",
     "pallet-balances/std",
-    "pallet-bridge/std",
-    "pallet-bridge-transfer/std",
+    "pallet-chain-bridge/std",
+    "pallet-bridge-common/std",
     "pallet-parachain-staking/std",
 ]
 try-runtime = ["frame-support/try-runtime"]