Migrate everything to the 2018 edition (#1758)

This commit is contained in:
Stanislav Tkach
2019-02-13 12:45:59 +02:00
committed by Gav Wood
parent a61c218cc3
commit ff5e4ca87e
38 changed files with 75 additions and 116 deletions
@@ -6,7 +6,7 @@ description = "Generic slots-based utilities for consensus"
edition = "2018"
[dependencies]
parity-codec = "3.0"
codec = { package = "parity-codec", version = "3.0" }
client = { package = "substrate-client", path = "../../../client" }
primitives = { package = "substrate-primitives", path = "../../../primitives" }
runtime_primitives = { package = "sr-primitives", path = "../../../sr-primitives" }
@@ -14,8 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
extern crate parity_codec as codec;
mod slots;
pub use slots::{Slots, SlotInfo};
@@ -220,7 +218,7 @@ impl SlotDuration {
C: ProvideRuntimeApi,
C::Api: AuraApi<B>,
{
use parity_codec::Decode;
use codec::Decode;
const SLOT_KEY: &[u8] = b"aura_slot_duration";
match client.get_aux(SLOT_KEY)? {
+2 -3
View File
@@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
futures = "0.1.17"
parity-codec = { version = "3.0" }
codec = { package = "parity-codec", version = "3.0" }
parity-codec-derive = { version = "3.0" }
primitives = { package = "substrate-primitives", path = "../../primitives" }
consensus = { package = "substrate-consensus-common", path = "../common" }
@@ -27,8 +27,7 @@ rhododendron = { version = "0.5.0", features = ["codec"] }
exit-future = "0.1"
[dev-dependencies]
substrate-keyring = { path = "../../keyring" }
substrate-executor = { path = "../../executor" }
keyring = { package = "substrate-keyring", path = "../../keyring" }
[features]
default = ["std"]
-2
View File
@@ -1318,8 +1318,6 @@ mod tests {
use primitives::H256;
use self::keyring::Keyring;
extern crate substrate_keyring as keyring;
type TestBlock = GenericTestBlock<()>;
struct FakeClient {