Fix benchmark in ci

bifrost-io · Jan 24, 2022 · 767bc19 · 767bc19
1 parent db0c1d8
commit 767bc19
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -24,7 +24,7 @@ jobs:
           target: wasm32-unknown-unknown
           default: true
       - name: Generate WeightInfo Files
-        run: make generate-all-weights
+        run: make generate-bifrost-weights
       - name: Commit Automatically
         uses: stefanzweifel/git-auto-commit-action@v4
         with:

diff --git a/pallets/salp/Cargo.toml b/pallets/salp/Cargo.toml
@@ -19,10 +19,11 @@ sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "pol
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
 xcm-support = { path = "../../xcm-support", default-features = false }
 orml-traits = { version = "0.4.1-dev", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false  }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13",default-features = false }
 
 [dev-dependencies]
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13"  }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
 pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13"}
 smallvec = "1.6.1"
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
@@ -31,7 +32,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad
 orml-tokens = "0.4.1-dev"
 orml-currencies = "0.4.1-dev"
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
 bifrost-bancor = { path = "../../pallets/bancor" }
 bifrost-runtime-common = { path = "../../runtime/common" }
 
@@ -50,6 +50,9 @@ std = [
 	"sp-arithmetic/std",
 	"orml-traits/std",
 	"xcm/std",
+	"xcm-builder/std",
+	"pallet-xcm/std",
+	"pallet-collective/std",
 	"xcm-support/std",
 ]
 

diff --git a/runtime/bifrost-kusama/Cargo.toml b/runtime/bifrost-kusama/Cargo.toml
@@ -43,7 +43,7 @@ pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polka
 pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
 pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13",default-features = false }
 pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
 pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
 pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
@@ -73,11 +73,11 @@ pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", bra
 parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13", default-features = false }
 
 # Polkadot dependencies
-pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false}
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
 polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
-xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false}
 xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
 
 # Bifrost

diff --git a/scripts/generate-weights.sh b/scripts/generate-weights.sh
@@ -10,7 +10,7 @@
 # sh ./script/generate-weights.sh asgard bifrost
 
 # 1. Build all-release which is added with "runtime-benchmarks" feature;
-make "build-all-release-with-bench"
+make build-bifrost-release-with-bench
 # 2. Filter the pallets of ${runtime} that should be executed benchmark;
 IFS=', ' read -r -a runtimes <<< $@;
 for runtime in "${runtimes[@]}"
@@ -31,6 +31,6 @@ do
             --wasm-execution=compiled \
             --heap-pages=4096 \
             --header=./HEADER-GPL3 \
-            --output="./runtime/${runtime}/src/weights/${pallet}.rs";
+            --output="./runtime/${runtime}-kusama/src/weights/${pallet}.rs";
         done
 done