Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ddorgan
polkadot
Commits
b22758d0
Unverified
Commit
b22758d0
authored
Dec 09, 2019
by
Ashley
Browse files
Merge remote-tracking branch 'parity/master' into ashley-futures-updates
parents
2e8b05ed
ca8d5c54
Changes
6
Hide whitespace changes
Inline
Side-by-side
executor/src/lib.rs
View file @
b22758d0
// Copyright 2017 Parity Technologies (UK) Ltd.
// Copyright 2017 Parity Technologies (UK) Ltd.
// This file is part of
Substrate
.
// This file is part of
Polkadot
.
// Substrate is free software: you can redistribute it and/or modify
// Substrate is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// it under the terms of the GNU General Public License as published by
...
...
runtime/build.rs
View file @
b22758d0
// Copyright 2019 Parity Technologies (UK) Ltd.
// Copyright 2019 Parity Technologies (UK) Ltd.
// This file is part of
Substrate
.
// This file is part of
Polkadot
.
// Substrate is free software: you can redistribute it and/or modify
// Substrate is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// it under the terms of the GNU General Public License as published by
...
...
runtime/src/claims.rs
View file @
b22758d0
// Copyright 2017-2018 Parity Technologies (UK) Ltd.
// Copyright 2017-2018 Parity Technologies (UK) Ltd.
// This file is part of
Substrate
.
// This file is part of
Polkadot
.
// Substrate is free software: you can redistribute it and/or modify
// Substrate is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// it under the terms of the GNU General Public License as published by
...
...
runtime/src/slots.rs
View file @
b22758d0
...
@@ -126,7 +126,7 @@ type WinnersData<T> =
...
@@ -126,7 +126,7 @@ type WinnersData<T> =
// This module's storage items.
// This module's storage items.
decl_storage!
{
decl_storage!
{
trait
Store
for
Module
<
T
:
Trait
>
as
Slots
{
trait
Store
for
Module
<
T
:
Trait
>
as
Slots
{
/// The number of auctions that been started so far.
/// The number of auctions that
have
been started so far.
pub
AuctionCounter
get
(
auction_counter
):
AuctionIndex
;
pub
AuctionCounter
get
(
auction_counter
):
AuctionIndex
;
/// Ordered list of all `ParaId` values that are managed by this module. This includes
/// Ordered list of all `ParaId` values that are managed by this module. This includes
...
...
test-parachains/adder/build.rs
View file @
b22758d0
// Copyright 2019 Parity Technologies (UK) Ltd.
// Copyright 2019 Parity Technologies (UK) Ltd.
// This file is part of
Substrate
.
// This file is part of
Polkadot
.
// Substrate is free software: you can redistribute it and/or modify
// Substrate is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// it under the terms of the GNU General Public License as published by
...
...
test-parachains/halt/build.rs
View file @
b22758d0
// Copyright 2019 Parity Technologies (UK) Ltd.
// Copyright 2019 Parity Technologies (UK) Ltd.
// This file is part of
Substrate
.
// This file is part of
Polkadot
.
// Substrate is free software: you can redistribute it and/or modify
// Substrate is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// it under the terms of the GNU General Public License as published by
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment