Merge remote-tracking branch 'upstream/master' into relax-digest-item…

…-ref

# Conflicts:
#	client/chain-spec/Cargo.toml
#	client/finality-grandpa/Cargo.toml
#	test-utils/runtime/transaction-pool/Cargo.toml

.cargo/config.toml

@@ -10,5 +10,24 @@ rustflags = [
  "-Aclippy::all",
  "-Dclippy::correctness",
  "-Aclippy::if-same-then-else",
- "-Aclippy::clone-double-ref"
+ "-Aclippy::clone-double-ref",
+ "-Dclippy::complexity",
+ "-Aclippy::clone_on_copy", # Too common
+ "-Aclippy::needless_lifetimes", # Backward compat?
+ "-Aclippy::zero-prefixed-literal", # 00_1000_000
+ "-Aclippy::type_complexity", # raison d'etre
+ "-Aclippy::nonminimal-bool", # maybe
+ "-Aclippy::borrowed-box", # Reasonable to fix this one
+ "-Aclippy::too-many-arguments", # (Turning this on would lead to)
+ "-Aclippy::unnecessary_cast", # Types may change
+ "-Aclippy::identity-op", # One case where we do 0 + 
+ "-Aclippy::useless_conversion", # Types may change
+ "-Aclippy::unit_arg", # styalistic.
+ "-Aclippy::option-map-unit-fn", # styalistic
+ "-Aclippy::bind_instead_of_map", # styalistic 
+ "-Aclippy::erasing_op", # E.g. 0 * DOLLARS
+ "-Aclippy::eq_op", # In tests we test equality.
+ "-Aclippy::while_immutable_condition", # false positives
+ "-Aclippy::needless_option_as_deref", # false positives
+ "-Aclippy::derivable_impls", # false positives
 ]

.git-blame-ignore-revs

@@ -0,0 +1,15 @@
+# You can easily exclude big automated code changes by running
+#
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+#
+# in your local repository. It will work also in IDE integrations.
+#
+# On versions of Git 2.20 and later comments (#), empty lines, and any leading and
+# trailing whitespace is ignored. Everything but a SHA-1 per line will error out on
+# older versions.
+#
+# You should add new commit hashes to this file when you create or find such big
+# automated refactorings while reading code history. If you only know the short hash,
+# use `git rev-parse 1d5abf01` to expand it to the full SHA1 hash needed in this file.
+
+1d5abf01abafdb6c15bcd0172f5de09fd87c5fbf # Run cargo fmt on the whole code base (#9394)

.gitlab-ci.yml

@@ -42,7 +42,6 @@ variables: &default-vars
  VAULT_SERVER_URL: "https://vault.parity-mgmt-vault.parity.io"
  VAULT_AUTH_PATH: "gitlab-parity-io-jwt"
  VAULT_AUTH_ROLE: "cicd_gitlab_parity_${CI_PROJECT_NAME}"
- PIPELINE_SCRIPTS_TAG: "v0.4"
 
 default:
  cache: {}
@@ -350,7 +349,7 @@ cargo-clippy:
  <<: *docker-env
  <<: *test-refs
  script:
- - SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy
+ - SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets
 
 cargo-check-benches:
  stage: test
@@ -520,35 +519,6 @@ test-full-crypto-feature:
  - time cargo +nightly build --verbose --no-default-features --features full_crypto
  - sccache -s
 
-
-# Mostly same as the job above, additional instrumentation was added to push test run times
-# to the time series database.
-# This is temporary and will be eventually removed.
-bench-test-full-crypto-feature:
- stage: test
- <<: *docker-env
- <<: *build-refs
- variables:
- <<: *default-vars
- RUSTFLAGS: "-Cdebug-assertions=y"
- RUST_BACKTRACE: 1
- before_script: [""]
- script:
- # disable sccache for the bench purposes
- - unset RUSTC_WRAPPER
- - START_TIME=`date '+%s'`
- - cd primitives/core/
- - time cargo +nightly build --verbose --no-default-features --features full_crypto
- - cd ../application-crypto
- - time cargo +nightly build --verbose --no-default-features --features full_crypto
- - END_TIME=`date '+%s'`
- - TOTAL_TIME=`expr $END_TIME - $START_TIME`
- # send the job time measuring to the prometheus endpoint
- - curl -d "parity_gitlab_job_time{project=\"$CI_PROJECT_PATH\",job=\"$CI_JOB_NAME\",runner=\"gitlab\"} $TOTAL_TIME" -X POST $VM_LONGTERM_URI/api/v1/import/prometheus
- tags:
- - linux-docker-compare
-
-
 test-wasmer-sandbox:
  stage: test
  <<: *docker-env
@@ -572,10 +542,12 @@ cargo-check-macos:
 
 #### stage: build
 
+# PIPELINE_SCRIPTS_TAG can be found in the project variables
+
 .check-dependent-project: &check-dependent-project
  stage: build
  <<: *docker-env
- <<: *test-refs-no-trigger
+ <<: *test-refs-no-trigger-prs-only
  <<: *vault-secrets
  script:
  - git clone
@@ -801,8 +773,6 @@ publish-rustdoc:
  # whole space-separated value.
  - '[[ " ${RUSTDOCS_DEPLOY_REFS} " =~ " ${CI_COMMIT_REF_NAME} " ]] || exit 0'
  # setup ssh
- # FIXME: add ssh to docker image
- - apt-get update && apt-get install -y ssh
  - eval $(ssh-agent)
  - ssh-add - <<< ${GITHUB_SSH_PRIV_KEY}
  - mkdir ~/.ssh && touch ~/.ssh/known_hosts

.maintain/frame-weight-template.hbs

@@ -1,6 +1,6 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");