Merge pull request #4 from jsidorenko/revert-2-giles-more

Revert "Merge master"

.cargo/config.toml

@@ -12,21 +12,22 @@ rustflags = [
  "-Aclippy::if-same-then-else",
  "-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::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::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
- "-Aclippy::stable_sort_primitive", # prefer stable sort
 ]

.github/workflows/auto-label-issues.yml

@@ -8,10 +8,10 @@ on:
 
 jobs:
  label-new-issues:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-latest 
  steps:
  - name: Label drafts
- uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4
+ uses: andymckay/labeler@master
  if: github.event.issue.author_association == 'NONE'
  with:
  add-labels: 'Z0-unconfirmed'

.github/workflows/auto-label-prs.yml

@@ -8,13 +8,13 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Label drafts
- uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4
+ uses: andymckay/labeler@master
  if: github.event.pull_request.draft == true
  with:
  add-labels: 'A3-inprogress'
  remove-labels: 'A0-pleasereview'
  - name: Label PRs
- uses: andymckay/labeler@e6c4322d0397f3240f0e7e30a33b5c5df2d39e90 # 1.0.4
+ uses: andymckay/labeler@master
  if: github.event.pull_request.draft == false && ! contains(github.event.pull_request.labels.*.name, 'A2-insubstantial')
  with:
  add-labels: 'A0-pleasereview'

.github/workflows/md-link-check.yml

@@ -13,7 +13,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v3
- - uses: gaurav-nelson/github-action-markdown-link-check@0a51127e9955b855a9bbfa1ff5577f1d1338c9a5 # 1.0.14
+ - uses: gaurav-nelson/github-action-markdown-link-check@9710f0fec812ce0a3b98bef4c9d842fc1f39d976 # v1.0.13
  with:
  use-quiet-mode: 'yes'
  config-file: '.github/workflows/mlc_config.json'

.github/workflows/monthly-tag.yml

@@ -32,7 +32,7 @@ jobs:
  ./scripts/ci/github/generate_changelog.sh ${{ steps.tags.outputs.old }} >> Changelog.md
  - name: Release snapshot
  id: release-snapshot
- uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4 latest version, repo archived
+ uses: actions/create-release@latest
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:

.github/workflows/release-tagging.yml

@@ -12,7 +12,7 @@ jobs:
 
  steps:
  - name: Set Git tag
- uses: s3krit/walking-tag-action@d04f7a53b72ceda4e20283736ce3627011275178 # latest version from master
+ uses: s3krit/walking-tag-action@master
  with:
  TAG_NAME: release
  TAG_MESSAGE: Latest release

.gitlab-ci.yml

@@ -41,7 +41,7 @@ workflow:
  - if: $CI_COMMIT_TAG
  - if: $CI_COMMIT_BRANCH
 
-variables:
+variables: &default-vars
  GIT_STRATEGY: fetch
  GIT_DEPTH: 100
  CARGO_INCREMENTAL: 0
@@ -82,31 +82,18 @@ default:
  tags:
  - kubernetes-parity-build
 
-.rust-info-script:
+.rust-info-script: &rust-info-script
  script:
  - rustup show
  - cargo --version
  - rustup +nightly show
  - cargo +nightly --version
 
-.pipeline-stopper-vars:
- script:
- - echo "Collecting env variables for the cancel-pipeline job"
- - echo "FAILED_JOB_URL=${CI_JOB_URL}" > pipeline-stopper.env
- - echo "FAILED_JOB_NAME=${CI_JOB_NAME}" >> pipeline-stopper.env
- - echo "PR_NUM=${CI_COMMIT_REF_NAME}" >> pipeline-stopper.env
-
-.pipeline-stopper-artifacts:
- artifacts:
- reports:
- dotenv: pipeline-stopper.env
-
 .docker-env:
  image: "${CI_IMAGE}"
  before_script:
  - !reference [.rust-info-script, script]
  - !reference [.rusty-cachier, before_script]
- - !reference [.pipeline-stopper-vars, script]
  after_script:
  - !reference [.rusty-cachier, after_script]
  tags:
@@ -131,18 +118,6 @@ default:
  - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
  - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
 
-# handle the specific case where benches could store incorrect bench data because of the downstream staging runs
-# exclude cargo-check-benches from such runs
-.test-refs-check-benches:
- rules:
- - if: $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "parent_pipeline" && $CI_IMAGE =~ /staging$/ 
- when: never
- - if: $CI_PIPELINE_SOURCE == "web"
- - if: $CI_PIPELINE_SOURCE == "schedule"
- - if: $CI_COMMIT_REF_NAME == "master"
- - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/ # PRs
- - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
-
 .test-refs-no-trigger:
  rules:
  - if: $CI_PIPELINE_SOURCE == "pipeline"
@@ -210,7 +185,6 @@ skip-if-draft:
  - echo "Ref is ${CI_COMMIT_REF_NAME}"
  - echo "pipeline source is ${CI_PIPELINE_SOURCE}"
  - ./scripts/ci/gitlab/skip_if_draft.sh
- allow_failure: true
 
 include:
  # check jobs
@@ -272,52 +246,35 @@ rusty-cachier-notify:
  when: on_failure
  variables:
  PROJECT_ID: "${CI_PROJECT_ID}"
- PROJECT_NAME: "${CI_PROJECT_NAME}"
  PIPELINE_ID: "${CI_PIPELINE_ID}"
- FAILED_JOB_URL: "${FAILED_JOB_URL}"
- FAILED_JOB_NAME: "${FAILED_JOB_NAME}"
- PR_NUM: "${PR_NUM}"
- trigger:
- project: "parity/infrastructure/ci_cd/pipeline-stopper"
-
-# need to copy jobs this way because otherwise gitlab will wait
-# for all 3 jobs to finish instead of cancelling if one fails
-cancel-pipeline-test-linux-stable1:
- extends: .cancel-pipeline-template
- needs:
- - job: "test-linux-stable 1/3"
+ trigger: "parity/infrastructure/ci_cd/pipeline-stopper"
 
-cancel-pipeline-test-linux-stable2:
+cancel-pipeline-test-linux-stable:
  extends: .cancel-pipeline-template
  needs:
- - job: "test-linux-stable 2/3"
-
-cancel-pipeline-test-linux-stable3:
- extends: .cancel-pipeline-template
- needs:
- - job: "test-linux-stable 3/3"
-
-cancel-pipeline-cargo-check-benches1:
- extends: .cancel-pipeline-template
- needs:
- - job: "cargo-check-benches 1/2"
-
-cancel-pipeline-cargo-check-benches2:
- extends: .cancel-pipeline-template
- needs:
- - job: "cargo-check-benches 2/2"
+ - job: test-linux-stable
+ artifacts: false
 
 cancel-pipeline-test-linux-stable-int:
  extends: .cancel-pipeline-template
  needs:
  - job: test-linux-stable-int
+ artifacts: false
 
 cancel-pipeline-cargo-check-subkey:
  extends: .cancel-pipeline-template
  needs:
  - job: cargo-check-subkey
+ artifacts: false
+
+cancel-pipeline-cargo-check-benches:
+ extends: .cancel-pipeline-template
+ needs:
+ - job: cargo-check-benches
+ artifacts: false
 
 cancel-pipeline-check-tracing:
  extends: .cancel-pipeline-template
  needs:
  - job: check-tracing
+ artifacts: false

.maintain/frame-weight-template.hbs

@@ -1,4 +1,20 @@
-{{header}}
+// This file is part of Substrate.
+
+// Copyright (C) 2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //! Autogenerated weights for {{pallet}}
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
@@ -48,23 +64,22 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
  {{~#each benchmark.components as |c| ~}}
  {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
  ) -> Weight {
- // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
- Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
+ ({{underscore benchmark.base_weight}} as Weight)
  {{#each benchmark.component_weight as |cw|}}
  // Standard Error: {{underscore cw.error}}
- .saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
+ .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
  {{/each}}
  {{#if (ne benchmark.base_reads "0")}}
- .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as u64))
+ .saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}} as Weight))
  {{/if}}
  {{#each benchmark.component_reads as |cr|}}
- .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
+ .saturating_add(T::DbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
  {{/each}}
  {{#if (ne benchmark.base_writes "0")}}
- .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as u64))
+ .saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}} as Weight))
  {{/if}}
  {{#each benchmark.component_writes as |cw|}}
- .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
+ .saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
  {{/each}}
  }
  {{/each}}
@@ -84,23 +99,22 @@ impl WeightInfo for () {
  {{~#each benchmark.components as |c| ~}}
  {{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
  ) -> Weight {
- // Minimum execution time: {{underscore benchmark.min_execution_time}} nanoseconds.
- Weight::from_ref_time({{underscore benchmark.base_weight}} as u64)
+ ({{underscore benchmark.base_weight}} as Weight)
  {{#each benchmark.component_weight as |cw|}}
  // Standard Error: {{underscore cw.error}}
- .saturating_add(Weight::from_ref_time({{underscore cw.slope}} as u64).saturating_mul({{cw.name}} as u64))
+ .saturating_add(({{underscore cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight))
  {{/each}}
  {{#if (ne benchmark.base_reads "0")}}
- .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as u64))
+ .saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}} as Weight))
  {{/if}}
  {{#each benchmark.component_reads as |cr|}}
- .saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as u64).saturating_mul({{cr.name}} as u64)))
+ .saturating_add(RocksDbWeight::get().reads(({{cr.slope}} as Weight).saturating_mul({{cr.name}} as Weight)))
  {{/each}}
  {{#if (ne benchmark.base_writes "0")}}
- .saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as u64))
+ .saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}} as Weight))
  {{/if}}
  {{#each benchmark.component_writes as |cw|}}
- .saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as u64).saturating_mul({{cw.name}} as u64)))
+ .saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
  {{/each}}
  }
  {{/each}}