Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
944c129
Features needed for reserve-backed stablecoins
gavofyork Sep 20, 2020
911795a
Builds & tests.
gavofyork Sep 20, 2020
ddf83eb
Double map for an efficient destroy.
gavofyork Sep 20, 2020
9c79b6d
Update frame/assets/src/lib.rs
gavofyork Sep 21, 2020
b8ef2fb
ED/zombie-count/refs
gavofyork Sep 21, 2020
1888155
Merge remote-tracking branch 'origin/gav-assets-extra' into gav-asset…
gavofyork Sep 21, 2020
8bae97f
Merge remote-tracking branch 'origin/master' into gav-assets-extra
gavofyork Sep 25, 2020
4df1054
Update frame/assets/src/lib.rs
gavofyork Sep 25, 2020
aef1d0c
Update frame/assets/Cargo.toml
gavofyork Sep 25, 2020
e302a0e
Merge remote-tracking branch 'origin/master' into gav-assets-extra
gavofyork Oct 1, 2020
b173c37
Docs
gavofyork Oct 2, 2020
6263beb
Merge remote-tracking branch 'origin/master' into gav-assets-extra
gavofyork Oct 2, 2020
fd75591
Some tests
gavofyork Oct 5, 2020
3d03358
More tests
gavofyork Oct 5, 2020
8aa7cc5
Allow for max_zombies to be adjusted
gavofyork Oct 5, 2020
347f2db
Test for set_max_zombies
gavofyork Oct 5, 2020
2d5f752
Tests and a couple of fixes
gavofyork Oct 5, 2020
760ba44
First few benchmarks
gavofyork Oct 8, 2020
b630906
Benchmarks.
gavofyork Oct 8, 2020
39a54ea
Merge remote-tracking branch 'origin/master' into gav-assets-extra
Oct 15, 2020
4d173bc
Merge branch 'gav-assets-extra' of github.com:paritytech/substrate in…
gavofyork Oct 15, 2020
4664812
Fix error message in test
gavofyork Oct 15, 2020
8954764
Fixes
gavofyork Oct 15, 2020
87f311e
Fixes
gavofyork Oct 15, 2020
d12fe90
Fixes
gavofyork Oct 15, 2020
e29b3fa
cargo run --release --features runtime-benchmarks --manifest-path bin…
Oct 15, 2020
85443d2
Update frame/assets/src/lib.rs
gavofyork Oct 16, 2020
b53c1ba
Fixes
gavofyork Oct 16, 2020
6de272f
Merge branch 'gav-assets-extra' of github.com:paritytech/substrate in…
gavofyork Oct 16, 2020
27353a7
Fixes
gavofyork Oct 16, 2020
bbdce2e
Merge remote-tracking branch 'origin/master' into gav-assets-extra
Oct 16, 2020
0b5fa74
Fixes
gavofyork Oct 16, 2020
89cbf7e
Merge branch 'gav-assets-extra' of gthub.com:paritytech/substrate int…
gavofyork Oct 16, 2020
1eff995
cargo run --release --features runtime-benchmarks --manifest-path bin…
Oct 16, 2020
1fe69b1
Fixes
gavofyork Oct 16, 2020
76f2e40
Merge branch 'gav-assets-extra' of github.com:paritytech/substrate in…
gavofyork Oct 16, 2020
a452393
Update default weight
shawntabrizi Oct 17, 2020
402835d
Merge branch 'master' into gav-assets-extra
shawntabrizi Oct 17, 2020
373f4d7
Add proper verification to benchmarks
shawntabrizi Oct 18, 2020
d8b840a
minor improvements to tests
shawntabrizi Oct 18, 2020
13a0cc0
Merge branch 'gav-assets-extra' of github.com:paritytech/substrate in…
gavofyork Nov 9, 2020
e65a75c
Merge remote-tracking branch 'origin/master' into gav-assets-extra
gavofyork Nov 9, 2020
dc0839d
Update frame/assets/src/benchmarking.rs
gavofyork Nov 9, 2020
d0f1829
Fix
gavofyork Nov 9, 2020
45f3c04
Merge branch 'gav-assets-extra' of github.com:paritytech/substrate in…
gavofyork Nov 9, 2020
0286497
Merge remote-tracking branch 'origin/master' into gav-assets-extra
gavofyork Dec 2, 2020
927bcc6
New weights system
gavofyork Dec 2, 2020
a1c43f9
fix compile
shawntabrizi Dec 3, 2020
82bbd66
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Dec 3, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into gav-assets-extra
  • Loading branch information
gavofyork committed Nov 9, 2020
commit e65a75c957dc9fad80fe3d981fc8083337ea6a9d
19 changes: 19 additions & 0 deletions .github/workflows/md-link-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Check Links

on:
pull_request:
branches:
- master
push:
branches:
- master

jobs:
markdown-link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-quiet-mode: 'yes'
config-file: '.github/workflows/mlc_config.json'
7 changes: 7 additions & 0 deletions .github/workflows/mlc_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"ignorePatterns": [
{
"pattern": "^https://crates.io"
}
]
}
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ build-chaos-docker:
DOCKERFILE: $PRODUCT.Dockerfile
CONTAINER_IMAGE: paritypr/$PRODUCT
environment:
name: parity-chaosnet
name: parity-simnet
services:
- docker:dind
before_script:
Expand Down Expand Up @@ -568,7 +568,7 @@ chaos-test-singlenodeheight:
needs:
- job: build-chaos-docker
tags:
- parity-chaos
- parity-simnet
variables:
<<: *default-vars
PRODUCT: substrate
Expand All @@ -579,7 +579,7 @@ chaos-test-singlenodeheight:
VERSION: "ci-${CI_COMMIT_SHORT_SHA}"
interruptible: true
environment:
name: parity-chaosnet
name: parity-simnet
script:
- simnet spawn dev -i $CONTAINER_IMAGE:$VERSION
- simnet singlenodeheight -h 30
Expand Down
7 changes: 4 additions & 3 deletions .maintain/chaostest/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- markdown-link-check-disable -->
chaostest
=========

Expand Down Expand Up @@ -56,7 +57,7 @@ DESCRIPTION
Extra documentation goes here
```

_See code: [src/commands/spawn/index.js](https://github.com/paritytech/substrate/blob/harry/chaostest-init/.maintain/chaostest/src/commands/spawn/index.js)_
_See code: [src/commands/spawn/index.js](https://github.com/paritytech/substrate/blob/master/.maintain/chaostest/src/commands/spawn/index.js)_

## `chaostest singlenodeheight`

Expand All @@ -71,7 +72,7 @@ FLAGS
-t, the wait time out before it halts the polling
```

_See code: [src/commands/singlenodeheight/index.js](https://github.com/paritytech/substrate/blob/harry/chaostest-init/.maintain/chaostest/src/commands/singlenodeheight/index.js)_
_See code: [src/commands/singlenodeheight/index.js](https://github.com/paritytech/substrate/blob/master/.maintain/chaostest/src/commands/singlenodeheight/index.js)_

## `chaostest clean`

Expand All @@ -85,5 +86,5 @@ FLAGS
-n , the desired namespace to delete on your k8s cluster
```

_See code: [src/commands/clean/index.js](https://github.com/paritytech/substrate/blob/harry/chaostest-init/.maintain/chaostest/src/commands/clean/index.js)_
_See code: [src/commands/clean/index.js](https://github.com/paritytech/substrate/blob/master/.maintain/chaostest/src/commands/clean/index.js)_
<!-- commandsstop -->
100 changes: 100 additions & 0 deletions .maintain/frame-weight-template.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
// This file is part of Substrate.

// Copyright (C) 2020 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.

//! Weights for {{pallet}}
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
//! DATE: {{date}}, STEPS: {{cmd.steps}}, REPEAT: {{cmd.repeat}}, LOW RANGE: {{cmd.lowest_range_values}}, HIGH RANGE: {{cmd.highest_range_values}}
//! EXECUTION: {{cmd.execution}}, WASM-EXECUTION: {{cmd.wasm_execution}}, CHAIN: {{cmd.chain}}, DB CACHE: {{cmd.db_cache}}

// Executed Command:
{{#each args as |arg|~}}
// {{arg}}
{{/each}}

#![allow(unused_parens)]
#![allow(unused_imports)]

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

/// Weight functions needed for {{pallet}}.
pub trait WeightInfo {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{c.name}}: u32, {{/each~}}
) -> Weight;
{{~/each}}
}

/// Weights for {{pallet}} using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Trait> WeightInfo for SubstrateWeight<T> {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
.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 Weight))
{{~/if}}
{{~#each benchmark.component_reads as |cr|}}
.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 Weight))
{{~/if}}
{{~#each benchmark.component_writes as |cw|}}
.saturating_add(T::DbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
{{~/each}}
}
{{~/each}}
}

// For backwards compatibility and tests
impl WeightInfo for () {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
{{~#each benchmark.components as |c| ~}}
{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
) -> Weight {
({{underscore benchmark.base_weight}} as Weight)
{{~#each benchmark.component_weight as |cw|}}
.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 Weight))
{{~/if}}
{{~#each benchmark.component_reads as |cr|}}
.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 Weight))
{{~/if}}
{{~#each benchmark.component_writes as |cw|}}
.saturating_add(RocksDbWeight::get().writes(({{cw.slope}} as Weight).saturating_mul({{cw.name}} as Weight)))
{{~/each}}
}
{{~/each}}
}
4 changes: 2 additions & 2 deletions .maintain/gitlab/check_line_width.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ do
echo "| error!"
echo "| Lines must not be longer than ${LINE_WIDTH} characters."
echo "| "
echo "| see more https://wiki.parity.io/Substrate-Style-Guide"
echo "| see more https://github.com/paritytech/substrate/blob/master/docs/STYLE_GUIDE.md"
echo "|"
FAIL="true"
fi
Expand All @@ -41,7 +41,7 @@ do
echo "| warning!"
echo "| Lines should be longer than ${GOOD_LINE_WIDTH} characters only in exceptional circumstances!"
echo "| "
echo "| see more https://wiki.parity.io/Substrate-Style-Guide"
echo "| see more https://github.com/paritytech/substrate/blob/master/docs/STYLE_GUIDE.md"
echo "|"
fi
echo "| file: ${file}"
Expand Down
2 changes: 1 addition & 1 deletion .maintain/gitlab/check_polkadot_companion_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ cd polkadot

# Test Polkadot pr or master branch with this Substrate commit.
cargo update -p sp-io
time cargo test --all --release --verbose
time cargo test --all --release --verbose --features=real-overseer
4 changes: 2 additions & 2 deletions .maintain/monitoring/alerting-rules/alerting-rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ groups:
##############################################################################

- alert: ContinuousTaskEnded
expr: '(polkadot_tasks_spawned_total == 1) - on(instance, task_name)
(polkadot_tasks_ended_total == 1)'
expr: '(polkadot_tasks_spawned_total{task_name != "basic-authorship-proposer"} == 1)
- on(instance, task_name) (polkadot_tasks_ended_total == 1)'
for: 5m
labels:
severity: warning
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.