Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
fix failing gitlab ci pipelien (#1838)
Browse files Browse the repository at this point in the history 
* fix failing gitlab ci pipelien

* Co #12558: Update `pallet-multisig` benches (#1805)

* Typo

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Add multisig weights

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* cargo update -p polkadot-runtime-common

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* bump zombienet version (#1786)

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Javier Viola <javier@parity.io>
  • Loading branch information
@EgorPopelyaev @ggwpez @pepoviola
3 people committed Nov 9, 2022
1 parent f11b6ab commit fb8c5a3
Show file tree
Hide file tree
Showing 7 changed files with 184 additions and 343 deletions.
31 changes: 1 addition & 30 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ variables:
CI_IMAGE: "paritytech/ci-linux:production"
DOCKER_OS: "debian:stretch"
ARCH: "x86_64"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.80"
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.82"

.collect-artifacts:
artifacts:
Expand Down Expand Up @@ -138,35 +138,6 @@ include:
# zombienet jobs
- scripts/ci/gitlab/pipeline/zombienet.yml

0006-rpc_collator_builds_blocks:
stage: integration-test
image: "${ZOMBIENET_IMAGE}"
<<: *zombienet-refs
needs:
- job: build-push-image-test-parachain
variables:
POLKADOT_IMAGE: "docker.io/paritypr/polkadot-debug:master"
GH_DIR: "https://github.com/paritytech/cumulus/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests"
COL_IMAGE: "docker.io/paritypr/test-parachain:${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
before_script:
- echo "Zombie-net Tests Config"
- echo "${ZOMBIENET_IMAGE}"
- echo "${RELAY_IMAGE}"
- echo "${COL_IMAGE}"
- echo "${GH_DIR}"
- export DEBUG=zombie
- export RELAY_IMAGE=${POLKADOT_IMAGE}
- export COL_IMAGE=${COL_IMAGE}
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
--github-remote-dir="${GH_DIR}"
--concurrency=1
--test="0006-rpc_collator_builds_blocks.feature"
allow_failure: true
retry: 2
tags:
- zombienet-polkadot-integration-test

#### stage: .post

# This job cancels the whole pipeline if any of provided jobs fail.
Expand Down
121 changes: 43 additions & 78 deletions parachains/runtimes/assets/statemine/src/weights/pallet_multisig.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,146 +17,111 @@
//! Autogenerated weights for `pallet_multisig`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2022-09-21, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `bm6`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
//! DATE: 2022-10-26, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("statemine-dev"), DB CACHE: 1024

// Executed Command:
// ./artifacts/polkadot-parachain
// ./target/production/polkadot-parachain
// benchmark
// pallet
// --chain=statemine-dev
// --execution=wasm
// --wasm-execution=compiled
// --pallet=pallet_multisig
// --extrinsic=*
// --extrinsic=
// --steps=50
// --repeat=20
// --json
// --header=./file_header.txt
// --output=./parachains/runtimes/assets/statemine/src/weights/pallet_multisig.rs

#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
#![allow(unused_imports)]

use frame_support::{traits::Get, weights::{Weight}};
use frame_support::{traits::Get, weights::Weight};
use sp_std::marker::PhantomData;

/// Weight functions for `pallet_multisig`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
/// The range of component `z` is `[0, 10000]`.
fn as_multi_threshold_1(z: u32, ) -> Weight {
Weight::from_ref_time(21_168_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(z as u64))
// Minimum execution time: 21_063 nanoseconds.
Weight::from_ref_time(21_862_078 as u64)
// Standard Error: 7
.saturating_add(Weight::from_ref_time(343 as u64).saturating_mul(z as u64))
}
// Storage: Multisig Multisigs (r:1 w:1)
// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
/// The range of component `s` is `[2, 100]`.
/// The range of component `z` is `[0, 10000]`.
fn as_multi_create(s: u32, z: u32, ) -> Weight {
Weight::from_ref_time(40_339_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(100_000 as u64).saturating_mul(s as u64))
// Standard Error: 0
.saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(z as u64))
// Minimum execution time: 48_498 nanoseconds.
Weight::from_ref_time(39_020_484 as u64)
// Standard Error: 917
.saturating_add(Weight::from_ref_time(101_566 as u64).saturating_mul(s as u64))
// Standard Error: 8
.saturating_add(Weight::from_ref_time(1_559 as u64).saturating_mul(z as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: Multisig Multisigs (r:1 w:1)
// Storage: Multisig Calls (r:1 w:1)
// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
/// The range of component `s` is `[2, 100]`.
/// The range of component `z` is `[0, 10000]`.
fn as_multi_create_store(s: u32, z: u32, ) -> Weight {
Weight::from_ref_time(43_149_000 as u64)
// Standard Error: 1_000
.saturating_add(Weight::from_ref_time(97_000 as u64).saturating_mul(s as u64))
// Standard Error: 0
.saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64))
.saturating_add(T::DbWeight::get().reads(3 as u64))
.saturating_add(T::DbWeight::get().writes(2 as u64))
}
// Storage: Multisig Multisigs (r:1 w:1)
/// The range of component `s` is `[3, 100]`.
/// The range of component `z` is `[0, 10000]`.
fn as_multi_approve(s: u32, z: u32, ) -> Weight {
Weight::from_ref_time(29_142_000 as u64)
// Standard Error: 1_000
.saturating_add(Weight::from_ref_time(107_000 as u64).saturating_mul(s as u64))
// Standard Error: 0
.saturating_add(Weight::from_ref_time(1_000 as u64).saturating_mul(z as u64))
// Minimum execution time: 40_013 nanoseconds.
Weight::from_ref_time(28_889_358 as u64)
// Standard Error: 846
.saturating_add(Weight::from_ref_time(117_565 as u64).saturating_mul(s as u64))
// Standard Error: 8
.saturating_add(Weight::from_ref_time(1_480 as u64).saturating_mul(z as u64))
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: Multisig Multisigs (r:1 w:1)
// Storage: Multisig Calls (r:1 w:1)
/// The range of component `s` is `[3, 100]`.
/// The range of component `z` is `[0, 10000]`.
fn as_multi_approve_store(s: u32, z: u32, ) -> Weight {
Weight::from_ref_time(44_799_000 as u64)
// Standard Error: 2_000
.saturating_add(Weight::from_ref_time(96_000 as u64).saturating_mul(s as u64))
// Standard Error: 0
.saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(2 as u64))
}
// Storage: Multisig Multisigs (r:1 w:1)
// Storage: Multisig Calls (r:1 w:1)
// Storage: System Account (r:1 w:1)
/// The range of component `s` is `[2, 100]`.
/// The range of component `z` is `[0, 10000]`.
fn as_multi_complete(s: u32, z: u32, ) -> Weight {
Weight::from_ref_time(54_815_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(131_000 as u64).saturating_mul(s as u64))
// Standard Error: 0
.saturating_add(Weight::from_ref_time(2_000 as u64).saturating_mul(z as u64))
.saturating_add(T::DbWeight::get().reads(3 as u64))
.saturating_add(T::DbWeight::get().writes(3 as u64))
// Minimum execution time: 52_880 nanoseconds.
Weight::from_ref_time(41_398_334 as u64)
// Standard Error: 760
.saturating_add(Weight::from_ref_time(143_103 as u64).saturating_mul(s as u64))
// Standard Error: 7
.saturating_add(Weight::from_ref_time(1_485 as u64).saturating_mul(z as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(2 as u64))
}
// Storage: Multisig Multisigs (r:1 w:1)
// Storage: unknown [0x3a65787472696e7369635f696e646578] (r:1 w:0)
/// The range of component `s` is `[2, 100]`.
fn approve_as_multi_create(s: u32, ) -> Weight {
Weight::from_ref_time(37_558_000 as u64)
// Standard Error: 1_000
.saturating_add(Weight::from_ref_time(110_000 as u64).saturating_mul(s as u64))
// Minimum execution time: 34_872 nanoseconds.
Weight::from_ref_time(37_363_593 as u64)
// Standard Error: 1_144
.saturating_add(Weight::from_ref_time(125_451 as u64).saturating_mul(s as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: Multisig Multisigs (r:1 w:1)
// Storage: Multisig Calls (r:1 w:0)
/// The range of component `s` is `[2, 100]`.
fn approve_as_multi_approve(s: u32, ) -> Weight {
Weight::from_ref_time(26_926_000 as u64)
// Standard Error: 0
.saturating_add(Weight::from_ref_time(125_000 as u64).saturating_mul(s as u64))
// Minimum execution time: 25_288 nanoseconds.
Weight::from_ref_time(26_822_824 as u64)
// Standard Error: 705
.saturating_add(Weight::from_ref_time(128_964 as u64).saturating_mul(s as u64))
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
// Storage: Multisig Multisigs (r:1 w:1)
// Storage: Multisig Calls (r:1 w:1)
// Storage: System Account (r:1 w:1)
/// The range of component `s` is `[2, 100]`.
fn approve_as_multi_complete(s: u32, ) -> Weight {
Weight::from_ref_time(64_260_000 as u64)
// Standard Error: 1_000
.saturating_add(Weight::from_ref_time(151_000 as u64).saturating_mul(s as u64))
.saturating_add(T::DbWeight::get().reads(3 as u64))
.saturating_add(T::DbWeight::get().writes(3 as u64))
}
// Storage: Multisig Multisigs (r:1 w:1)
// Storage: Multisig Calls (r:1 w:1)
/// The range of component `s` is `[2, 100]`.
fn cancel_as_multi(s: u32, ) -> Weight {
Weight::from_ref_time(53_920_000 as u64)
// Standard Error: 1_000
.saturating_add(Weight::from_ref_time(122_000 as u64).saturating_mul(s as u64))
.saturating_add(T::DbWeight::get().reads(2 as u64))
.saturating_add(T::DbWeight::get().writes(2 as u64))
// Minimum execution time: 34_669 nanoseconds.
Weight::from_ref_time(36_953_098 as u64)
// Standard Error: 944
.saturating_add(Weight::from_ref_time(132_676 as u64).saturating_mul(s as u64))
.saturating_add(T::DbWeight::get().reads(1 as u64))
.saturating_add(T::DbWeight::get().writes(1 as u64))
}
}
Loading

0 comments on commit fb8c5a3

Please sign in to comment.