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

Commit 41066fc

Browse files
committed
Merge remote-tracking branch 'origin/master' into master_wasmtime_faster_instantiation
2 parents 173baa8 + 2b1326a commit 41066fc

File tree

33 files changed

+1268
-993
lines changed

33 files changed

+1268
-993
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ updates:
55
labels: ["A2-insubstantial", "B0-silent", "C1-low 📌"]
66
schedule:
77
interval: "daily"
8+
- package-ecosystem: github-actions
9+
directory: '/'
10+
labels: ["A2-insubstantial", "B0-silent", "C1-low 📌", "E3-dependencies"]
11+
schedule:
12+
interval: daily

.gitlab-ci.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,3 +201,29 @@ deploy-prometheus-alerting-rules:
201201
changes:
202202
- .gitlab-ci.yml
203203
- ./scripts/ci/monitoring/**/*
204+
205+
#### stage: .post
206+
207+
# This job cancels the whole pipeline if any of provided jobs fail.
208+
# In a DAG, every jobs chain is executed independently of others. The `fail_fast` principle suggests
209+
# to fail the pipeline as soon as possible to shorten the feedback loop.
210+
cancel-pipeline:
211+
stage: .post
212+
needs:
213+
- job: test-linux-stable
214+
artifacts: false
215+
- job: test-linux-stable-int
216+
artifacts: false
217+
- job: cargo-check-subkey
218+
artifacts: false
219+
- job: cargo-check-benches
220+
artifacts: false
221+
- job: check-tracing
222+
artifacts: false
223+
rules:
224+
- if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
225+
when: on_failure
226+
variables:
227+
PROJECT_ID: "${CI_PROJECT_ID}"
228+
PIPELINE_ID: "${CI_PIPELINE_ID}"
229+
trigger: "parity/infrastructure/ci_cd/pipeline-stopper"

Cargo.lock

Lines changed: 19 additions & 134 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bin/node/bench/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sp-runtime = { version = "6.0.0", path = "../../../primitives/runtime" }
1919
sp-state-machine = { version = "0.12.0", path = "../../../primitives/state-machine" }
2020
serde = "1.0.136"
2121
serde_json = "1.0.79"
22-
derive_more = "0.99.16"
22+
derive_more = { version = "0.99.17", default-features = false, features = ["display"] }
2323
kvdb = "0.11.0"
2424
kvdb-rocksdb = "0.15.1"
2525
sp-trie = { version = "6.0.0", path = "../../../primitives/trie" }

bin/node/bench/src/tempdb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use kvdb::{DBTransaction, KeyValueDB};
2020
use kvdb_rocksdb::{Database, DatabaseConfig};
2121
use std::{io, path::PathBuf, sync::Arc};
2222

23-
#[derive(Debug, Clone, Copy, derive_more::Display)]
23+
#[derive(Clone, Copy, Debug)]
2424
pub enum DatabaseType {
2525
RocksDb,
2626
ParityDb,

bin/node/bench/src/trie.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ impl core::BenchmarkDescription for TrieReadBenchmarkDescription {
155155

156156
fn name(&self) -> Cow<'static, str> {
157157
format!(
158-
"Trie read benchmark({} database ({} keys), db_type: {})",
158+
"Trie read benchmark({:?} database ({} keys), db_type: {:?})",
159159
self.database_size,
160160
pretty_print(self.database_size.keys()),
161161
self.database_type,
@@ -260,7 +260,7 @@ impl core::BenchmarkDescription for TrieWriteBenchmarkDescription {
260260

261261
fn name(&self) -> Cow<'static, str> {
262262
format!(
263-
"Trie write benchmark({} database ({} keys), db_type = {})",
263+
"Trie write benchmark({:?} database ({} keys), db_type = {:?})",
264264
self.database_size,
265265
pretty_print(self.database_size.keys()),
266266
self.database_type,

bin/node/runtime/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,8 @@ impl pallet_contracts::Config for Runtime {
11181118
type Schedule = Schedule;
11191119
type AddressGenerator = pallet_contracts::DefaultAddressGenerator;
11201120
type ContractAccessWeight = pallet_contracts::DefaultContractAccessWeight<RuntimeBlockWeights>;
1121+
type MaxCodeLen = ConstU32<{ 128 * 1024 }>;
1122+
type RelaxedMaxCodeLen = ConstU32<{ 256 * 1024 }>;
11211123
}
11221124

11231125
impl pallet_sudo::Config for Runtime {

client/authority-discovery/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ sp-keystore = { version = "0.12.0", path = "../../primitives/keystore" }
3838
sp-runtime = { version = "6.0.0", path = "../../primitives/runtime" }
3939

4040
[dev-dependencies]
41-
quickcheck = "1.0.3"
41+
quickcheck = { version = "1.0.3", default-features = false }
4242
sp-tracing = { version = "5.0.0", path = "../../primitives/tracing" }
4343
substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }

0 commit comments

Comments
 (0)