Merge branch 'development' into migration-constantinople

.travis.yml

@@ -1,7 +1,7 @@
 language: rust
 
 rust:
-  - 1.42.0
+  - 1.43.0
 
 matrix:
   include:

node/src/chain_spec.rs

@@ -35,7 +35,6 @@ use babe_primitives::AuthorityId as BabeId;
 use grandpa_primitives::AuthorityId as GrandpaId;
 use im_online::sr25519::AuthorityId as ImOnlineId;
 use serde_json as json;
-use substrate_service;
 
 type AccountPublic = <Signature as Verify>::Signer;
 

node/src/service.rs

@@ -49,9 +49,9 @@ construct_simple_protocol! {
 // Declare an instance of the native executor named `Executor`. Include the wasm binary as the
 // equivalent wasm code.
 native_executor_instance!(
-	pub Executor,
-	node_runtime::api::dispatch,
-	node_runtime::native_version
+    pub Executor,
+    node_runtime::api::dispatch,
+    node_runtime::native_version
 );
 
 /// Starts a `ServiceBuilder` for a full service.

runtime-modules/common/src/currency.rs

@@ -1,6 +1,5 @@
 use sr_primitives::traits::Convert;
 use srml_support::traits::{Currency, LockableCurrency, ReservableCurrency};
-use system;
 
 pub trait GovernanceCurrency: system::Trait + Sized {
     type Currency: Currency<Self::AccountId>

runtime-modules/forum/src/lib.rs

@@ -106,7 +106,6 @@ const ERROR_CATEGORY_CANNOT_BE_UNARCHIVED_WHEN_DELETED: &str =
 //#[cfg(any(feature = "std", test))]
 //use sr_primitives::{StorageOverlay, ChildrenStorageOverlay};
 
-use system;
 use system::{ensure_root, ensure_signed};
 
 /// Represents a user in this forum.

runtime-modules/hiring/src/lib.rs

@@ -27,7 +27,6 @@ use mockall::*;
 use stake::{InitiateUnstakingError, Stake, StakeActionError, StakingError, Trait as StakeTrait};
 
 use codec::Codec;
-use system;
 
 use runtime_primitives::traits::Zero;
 use runtime_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic};
@@ -52,7 +51,6 @@ mod mock;
 mod test;
 
 pub use hiring::*;
-use stake;
 
 /// Main trait of hiring substrate module
 pub trait Trait: system::Trait + stake::Trait + Sized {

runtime-modules/membership/src/members.rs

@@ -12,7 +12,6 @@ use srml_support::traits::{Currency, Get};
 use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, Parameter};
 
 use system::{self, ensure_root, ensure_signed};
-use timestamp;
 
 pub use super::role_types::*;
 

runtime-modules/proposals/discussion/src/lib.rs

@@ -71,13 +71,13 @@ decl_event!(
         MemberId = MemberId<T>,
         <T as Trait>::PostId,
     {
-    	/// Emits on thread creation.
+        /// Emits on thread creation.
         ThreadCreated(ThreadId, MemberId),
 
-    	/// Emits on post creation.
+        /// Emits on post creation.
         PostCreated(PostId, MemberId),
 
-    	/// Emits on post update.
+        /// Emits on post update.
         PostUpdated(PostId, MemberId),
     }
 );

runtime-modules/proposals/engine/src/lib.rs

@@ -195,7 +195,7 @@ decl_event!(
         <T as system::Trait>::AccountId,
         <T as stake::Trait>::StakeId,
     {
-    	/// Emits on proposal creation.
+        /// Emits on proposal creation.
         /// Params:
         /// - Member id of a proposer.
         /// - Id of a newly created proposal after it was saved in storage.

runtime-modules/recurring-reward/src/lib.rs

@@ -14,7 +14,6 @@ use runtime_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic,
 use srml_support::{decl_module, decl_storage, ensure, Parameter};
 
 use minting::{self, BalanceOf};
-use system;
 
 mod mock;
 mod tests;

runtime-modules/roles/src/traits.rs

@@ -1,5 +1,4 @@
 use crate::actors;
-use system;
 
 // Roles
 pub trait Roles<T: system::Trait> {

runtime-modules/stake/src/lib.rs

@@ -12,7 +12,6 @@ use srml_support::traits::{Currency, ExistenceRequirement, Get, Imbalance, Withd
 use srml_support::{decl_module, decl_storage, ensure, Parameter};
 
 use rstd::collections::btree_map::BTreeMap;
-use system;
 
 mod errors;
 pub use errors::*;

runtime-modules/token-minting/src/lib.rs

@@ -20,8 +20,6 @@ mod tests;
 
 pub use mint::*;
 
-use system;
-
 pub trait Trait: system::Trait {
     /// The currency to mint.
     type Currency: Currency<Self::AccountId>;

runtime-modules/versioned-store-permissions/src/lib.rs

@@ -6,7 +6,6 @@ use rstd::collections::btree_map::BTreeMap;
 use rstd::prelude::*;
 use runtime_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};
 use srml_support::{decl_module, decl_storage, dispatch, ensure, Parameter};
-use system;
 
 // EntityId, ClassId -> should be configured on versioned_store::Trait
 pub use versioned_store::{ClassId, ClassPropertyValue, EntityId, Property, PropertyValue};

runtime-modules/versioned-store/src/lib.rs

@@ -18,7 +18,6 @@ use codec::{Decode, Encode};
 use rstd::collections::btree_set::BTreeSet;
 use rstd::prelude::*;
 use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure};
-use system;
 
 mod example;
 mod mock;

runtime/src/lib.rs

@@ -412,16 +412,11 @@ use governance::{council, election};
 use membership::members;
 use storage::{data_directory, data_object_storage_registry, data_object_type_registry};
 pub use versioned_store;
-use versioned_store_permissions;
 
 pub use content_working_group as content_wg;
 mod migration;
-use hiring;
-use minting;
-use recurringrewards;
 use roles::actors;
 use service_discovery::discovery;
-use stake;
 
 /// Alias for ContentId, used in various places.
 pub type ContentId = primitives::H256;

runtime/src/migration.rs

@@ -6,7 +6,6 @@ use common::currency::BalanceOf;
 use rstd::prelude::*;
 use sr_primitives::{print, traits::Zero};
 use srml_support::{debug, decl_event, decl_module, decl_storage};
-use system;
 
 impl<T: Trait> Module<T> {
     /// This method is called from on_initialize() when a runtime upgrade is detected. This