Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync upstream on 2020-12-01 #10

Merged
merged 27 commits into from
Dec 1, 2020
Merged

Sync upstream on 2020-12-01 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
94d27ef
CI: build docs after test; publish docs after build (#7591)
TriplEight Nov 25, 2020
45a0ea7
node-template: add aura to light block import pipeline (#7595)
andresilva Nov 25, 2020
bce646d
Fix notifications sometimes not being sent (#7594)
tomaka Nov 25, 2020
1ec8a7f
Bump rpassword from 4.0.5 to 5.0.0 (#7597)
dependabot[bot] Nov 25, 2020
fee1093
remove std feature flags for assert macros (#7600)
apopiak Nov 25, 2020
cff25fb
Add small header cache (#7516)
arkpar Nov 25, 2020
ac4366b
Inform sync explicitly about new best block (#7604)
bkchr Nov 26, 2020
021da1f
Bump directories from 2.0.2 to 3.0.1 (#7609)
dependabot[bot] Nov 27, 2020
07a8740
Remove `RpcMetrics` weirdness (#7608)
bkchr Nov 27, 2020
6c0cd2a
Upgrade to libp2p-0.31. (#7606)
romanb Nov 27, 2020
c116342
Add Key Subcommand to node-template (#7615)
gnunicorn Nov 27, 2020
de44c00
Forward storage changes in manual seal (#7614)
bkchr Nov 27, 2020
d428fc7
chore/error: remove from str conversion and add deprecation notificat…
drahnr Nov 27, 2020
ca62de0
network: don't force send block announcements (#7601)
andresilva Nov 27, 2020
b2d9aff
Change TRACING_SET to static (#7607)
insipx Nov 28, 2020
72cfd77
sc-network: Log outgoing notifications too (#7624)
tomaka Nov 30, 2020
9450a9d
Bump console_log from 0.1.2 to 0.2.0 (#7623)
dependabot[bot] Nov 30, 2020
2fbab76
`sudo_as` should return a result (#7620)
shawntabrizi Nov 30, 2020
779c801
Fix wrong value put for pending_opening (#7633)
tomaka Nov 30, 2020
237874b
Rename pallet trait `Trait` to `Config` (#7599)
gui1117 Nov 30, 2020
21fe14a
resolve unresolved error nits of #7617 (#7631)
drahnr Nov 30, 2020
f5088c5
Fix bad state transition with DisabledPendingEnable+OpenDesiredByRemo…
tomaka Nov 30, 2020
125cf19
Renames of `Trait` to `Config` in README.md, weight templates and few…
gui1117 Nov 30, 2020
dcf6a3a
Fix CI Link Check (#7639)
shawntabrizi Nov 30, 2020
0e05bf5
Merge remote-tracking branch 'parity/master' into updates/2020-12-01
clearloop Dec 1, 2020
ace7f47
Fix cargo clippy warning in peerset. (#7641)
jolestar Dec 1, 2020
8d94ab4
Merge remote-tracking branch 'parity/master' into updates/2020-12-01
clearloop Dec 1, 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
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,9 @@ build-rust-doc:
stage: build
<<: *docker-env
<<: *test-refs
allow_failure: true
needs:
- job: test-linux-stable
artifacts: false
variables:
<<: *default-vars
RUSTFLAGS: -Dwarnings
Expand Down Expand Up @@ -677,6 +679,8 @@ publish-s3-doc:
needs:
- job: build-rust-doc
artifacts: true
- job: build-linux-substrate
artifacts: false
<<: *build-refs
<<: *kubernetes-build
variables:
Expand Down
2 changes: 1 addition & 1 deletion .maintain/frame-weight-template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub trait WeightInfo {

/// 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> {
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
{{~#each benchmarks as |benchmark|}}
fn {{benchmark.name~}}
(
Expand Down
Loading