Merge remote-tracking branch 'origin/master' into bko-bridge-ro-wo

paritytech · Oct 6, 2022 · 67ebeaf · 67ebeaf
2 parents 58607d1 + 4edfb5b
commit 67ebeaf
Show file tree

Hide file tree

Showing 84 changed files with 943 additions and 1,127 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ default:
     when:
       - runner_system_failure
       - unknown_failure
-      - api_failure 
+      - api_failure
   interruptible:                   true
   tags:
     - linux-docker
@@ -145,7 +145,6 @@ test:
 #    RUSTFLAGS:                     "-D warnings"
   script:                          &test-script
     - time cargo fetch
-    - time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output  ".packages[] | select(.name == \"polkadot-test-runtime\").manifest_path"`
     - time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output  ".packages[] | select(.name == \"polkadot-runtime\").manifest_path"`
     - time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output  ".packages[] | select(.name == \"kusama-runtime\").manifest_path"`
     - CARGO_NET_OFFLINE=true SKIP_POLKADOT_RUNTIME_WASM_BUILD=1 SKIP_KUSAMA_RUNTIME_WASM_BUILD=1 SKIP_POLKADOT_TEST_RUNTIME_WASM_BUILD=1 time cargo test --verbose --workspace
@@ -196,7 +195,6 @@ build:
   # master
   script:                          &build-script
     - time cargo fetch
-    - time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output  ".packages[] | select(.name == \"polkadot-test-runtime\").manifest_path"`
     - time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output  ".packages[] | select(.name == \"polkadot-runtime\").manifest_path"`
     - time cargo fetch --manifest-path=`cargo metadata --format-version=1 | jq --compact-output --raw-output  ".packages[] | select(.name == \"kusama-runtime\").manifest_path"`
     - CARGO_NET_OFFLINE=true SKIP_POLKADOT_RUNTIME_WASM_BUILD=1 SKIP_KUSAMA_RUNTIME_WASM_BUILD=1 SKIP_POLKADOT_TEST_RUNTIME_WASM_BUILD=1 time cargo build --release --verbose --workspace

diff --git a/.maintain/millau-weight-template.hbs b/.maintain/millau-weight-template.hbs
@@ -46,9 +46,11 @@ pub trait WeightInfo {
 	{{~/each}}
 }
 
-/// Weights for `{{pallet}}` using the Millau node and recommended hardware.
-pub struct MillauWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for MillauWeight<T> {
+/// Weights for `{{pallet}}` that are generated using one of the Bridge testnets.
+///
+/// Those weights are test only and must never be used in production. 
+pub struct BridgeWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfo for BridgeWeight<T> {
 	{{~#each benchmarks as |benchmark|}}
 	fn {{benchmark.name~}}
 	(