Merge pull request #177 from mnaamani/upgrade-libp2p

Upgrade libp2p

.dockerignore

@@ -0,0 +1 @@
+target/

.travis.yml

@@ -1,7 +1,7 @@
 language: rust
 
 rust:
-  - 1.40.0
+  - 1.41.1
 # Caching saves a lot of time but often causes stalled builds...
 # disabled for now
 # look into solution here: https://levans.fr/rust_travis_cache.html
@@ -9,7 +9,7 @@ rust:
 #  - cargo
 
 before_script:
-  - rustup component add rustfmt --toolchain 1.40.0-x86_64-unknown-linux-gnu
+  - rustup component add rustfmt --toolchain 1.41.1-x86_64-unknown-linux-gnu
   - rustup update nightly
   - rustup target add wasm32-unknown-unknown --toolchain nightly
   - cargo +nightly install --git https://github.com/alexcrichton/wasm-gc --force

Cargo.toml

@@ -4,7 +4,7 @@ edition = '2018'
 name = 'joystream-node-runtime'
 # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1
 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion
-version = '6.1.0'
+version = '6.5.0'
 
 [features]
 default = ['std']
@@ -31,7 +31,7 @@ std = [
     'indices/std',
     'grandpa/std',
     'primitives/std',
-    'runtime-primitives/std',
+    'sr-primitives/std',
     'system/std',
     'timestamp/std',
     'sudo/std',
@@ -56,25 +56,25 @@ std = [
 default-features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-babe'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.babe-primitives]
 default-features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'substrate-consensus-babe-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.balances]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-balances'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.substrate-client]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'substrate-client'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.codec]
 default-features = false
@@ -86,43 +86,43 @@ version = '1.0.0'
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-executive'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.grandpa]
 default-features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-grandpa'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.indices]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-indices'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.offchain-primitives]
 default-features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'substrate-offchain-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.primitives]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'substrate-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.rstd]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-std'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.runtime-io]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-io'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.safe-mix]
 default-features = false
@@ -133,118 +133,118 @@ features = ['derive']
 optional = true
 version = '1.0.101'
 
-[dependencies.runtime-primitives]
+[dependencies.sr-primitives]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.substrate-session]
 default-features = false
 git = 'https://github.com/paritytech/substrate.git'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.sudo]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-sudo'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.srml-support]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-support'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-system'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.timestamp]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-timestamp'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.version]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-version'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.authority-discovery-primitives]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'substrate-authority-discovery-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.authority-discovery]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-authority-discovery'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.authorship]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-authorship'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.finality-tracker]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-finality-tracker'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.im-online]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-im-online'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.session]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-session'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.offences]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-offences'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.sr-staking-primitives]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'sr-staking-primitives'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.staking]
 default_features = false
 git = 'https://github.com/paritytech/substrate.git'
 package = 'srml-staking'
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.transaction-payment]
 package = "srml-transaction-payment"
 git = 'https://github.com/paritytech/substrate.git'
 default_features = false
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.randomness-collective-flip]
 package = "srml-randomness-collective-flip"
 git = 'https://github.com/paritytech/substrate.git'
 default_features = false
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [dependencies.system-rpc-runtime-api]
 package = "srml-system-rpc-runtime-api"
 git = 'https://github.com/paritytech/substrate.git'
 default_features = false
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 # don't rename the dependency it is causing some strange compiler error:
 # https://github.com/rust-lang/rust/issues/64450
@@ -252,7 +252,7 @@ rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
 package = 'srml-staking-reward-curve'
 git = 'https://github.com/paritytech/substrate.git'
 default_features = false
-rev = '0e3001a1ad6fa3d1ba7da7342a8d0d3b3facb2f3'
+rev = 'c37bb08535c49a12320af7facfd555ce05cce2e8'
 
 [build-dependencies.wasm-builder-runner]
 package = 'substrate-wasm-builder-runner'
@@ -260,42 +260,42 @@ version = '1.0.4'
 
 [dependencies.forum]
 default_features = false
-git = 'https://github.com/joystream/substrate-forum-module'
 package = 'substrate-forum-module'
-rev = '4bdeadaadfcca1fd6e822c520f429d4beacc4c8a'
+git = 'https://github.com/joystream/substrate-forum-module'
+tag = 'v1.1.0'
 
 [dependencies.minting]
 default_features = false
-git = 'https://github.com/joystream/substrate-token-minting-module/'
 package = 'substrate-token-mint-module'
-rev = '5570e3b56e9caffa7df1dbede6308b2e6ce18217'
-
-[dependencies.recurringrewards]
-default_features = false
-git = 'https://github.com/Joystream/substrate-recurring-reward-module'
-package = 'substrate-recurring-reward-module'
-rev = '417f7bb5b82ae50f02716ac4eefa2fc7952e0f61'
+git = 'https://github.com/joystream/substrate-token-minting-module/'
+tag = 'v1.0.0'
 
 [dependencies.stake]
 default_features = false
-git = 'https://github.com/Joystream/substrate-stake-module/'
 package = 'substrate-stake-module'
-rev = '0516efe9230da112bc095e28f34a3715c2e03ca8'
+git = 'https://github.com/Joystream/substrate-stake-module/'
+tag = 'v1.0.0'
+
+[dependencies.recurringrewards]
+default_features = false
+package = 'substrate-recurring-reward-module'
+git = 'https://github.com/Joystream/substrate-recurring-reward-module'
+tag = 'v1.0.0'
 
 [dependencies.hiring]
 default_features = false
-git = 'https://github.com/Joystream/substrate-hiring-module'
 package = 'substrate-hiring-module'
-rev = '485c8be73891183910721e874cf9741dec6d824a'
+git = 'https://github.com/Joystream/substrate-hiring-module'
+tag = 'v1.0.0'
 
 [dependencies.versioned_store]
 default_features = false
 package ='substrate-versioned-store'
 git = 'https://github.com/joystream/substrate-versioned-store-module'
-rev = 'd0c68722405355404840512edf3064d5ced3e1fe'
+tag = 'v1.0.0'
 
 [dependencies.versioned_store_permissions]
 default_features = false
 package = 'substrate-versioned-store-permissions-module'
 git = 'https://github.com/joystream/substrate-versioned-store-permissions-module'
-rev = '816b796b1b72bba05eebe128cdaa5e18611ac3ae'
+tag = 'v1.0.0'

runtime_dockerfile

@@ -8,9 +8,5 @@ ENV TERM=xterm
 
 RUN rustup show
 
-# Ensure clean build
-RUN cargo clean
-RUN rm -fr target/
-
 # Build the runtime
 RUN cargo test && cargo build --release

src/content_working_group/lib.rs

@@ -14,8 +14,8 @@ use rstd::collections::btree_map::BTreeMap;
 use rstd::collections::btree_set::BTreeSet;
 use rstd::convert::From;
 use rstd::prelude::*;
-use runtime_primitives::traits::{One, Zero}; // Member, SimpleArithmetic, MaybeSerialize
-use srml_support::traits::{Currency, ExistenceRequirement, WithdrawReasons};
+use sr_primitives::traits::{One, Zero}; // Member, SimpleArithmetic, MaybeSerialize
+use srml_support::traits::{Currency, ExistenceRequirement, Get, WithdrawReasons};
 use srml_support::{
     decl_event,
     decl_module,
@@ -183,7 +183,8 @@ pub static MSG_FULL_CURATOR_OPENING_APPLICATION_NOT_ACTIVE: &str = "ApplicationN
 pub static MSG_FILL_CURATOR_OPENING_INVALID_NEXT_PAYMENT_BLOCK: &str =
     "Reward policy has invalid next payment block number";
 pub static MSG_FILL_CURATOR_OPENING_MINT_DOES_NOT_EXIST: &str = "Working group mint does not exist";
-
+pub static MSG_FILL_CURATOR_OPENING_APPLICATION_FOR_WRONG_OPENING: &str =
+    "Applications not for opening";
 // Errors for `withdraw_curator_application`
 pub static MSG_WITHDRAW_CURATOR_APPLICATION_APPLICATION_DOES_NOT_EXIST: &str =
     "ApplicationDoesNotExist";
@@ -888,7 +889,8 @@ impl<T: hiring::Trait> rstd::convert::From<WrappedError<hiring::FillOpeningError
                 },
             },
             hiring::FillOpeningError::<T>::ApplicationDoesNotExist(_application_id) => MSG_FULL_CURATOR_OPENING_APPLICATION_DOES_NOT_EXIST,
-            hiring::FillOpeningError::<T>::ApplicationNotInActiveStage(_application_id) => MSG_FULL_CURATOR_OPENING_APPLICATION_NOT_ACTIVE
+            hiring::FillOpeningError::<T>::ApplicationNotInActiveStage(_application_id) => MSG_FULL_CURATOR_OPENING_APPLICATION_NOT_ACTIVE,
+            hiring::FillOpeningError::<T>::ApplicationForWrongOpening(_application_id) => MSG_FILL_CURATOR_OPENING_APPLICATION_FOR_WRONG_OPENING,
         }
     }
 }

src/content_working_group/mock.rs

@@ -5,7 +5,7 @@ pub use srml_support::traits::Currency;
 pub use system;
 
 pub use primitives::{map, Blake2Hasher, H256};
-pub use runtime_primitives::{
+pub use sr_primitives::{
     testing::{Digest, DigestItem, Header, UintAuthorityId},
     traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize},
     weights::Weight,

src/content_working_group/tests.rs

@@ -7,7 +7,7 @@ use super::mock::{self, *};
 use hiring;
 use rstd::collections::btree_map::BTreeMap;
 use rstd::collections::btree_set::BTreeSet;
-use runtime_primitives::traits::One;
+use sr_primitives::traits::One;
 use srml_support::{assert_err, assert_ok, StorageLinkedMap, StorageValue};
 
 /// DIRTY IMPORT BECAUSE

src/currency.rs

@@ -1,4 +1,4 @@
-use runtime_primitives::traits::Convert;
+use sr_primitives::traits::Convert;
 use srml_support::traits::{Currency, LockableCurrency, ReservableCurrency};
 use system;
 

src/governance/council.rs

@@ -1,5 +1,5 @@
 use rstd::prelude::*;
-use runtime_primitives::traits::Zero;
+use sr_primitives::traits::Zero;
 use srml_support::{decl_event, decl_module, decl_storage, ensure};
 use system::{self, ensure_root};
 

src/governance/election.rs

@@ -6,9 +6,9 @@ use system::{self, ensure_root, ensure_signed};
 use codec::{Decode, Encode};
 use rstd::collections::btree_map::BTreeMap;
 use rstd::ops::Add;
-use runtime_primitives::traits::{Hash, Zero};
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
+use sr_primitives::traits::{Hash, Zero};
 
 use super::sealed_vote::SealedVote;
 use super::stake::Stake;

src/governance/mock.rs

@@ -6,7 +6,7 @@ use crate::membership;
 pub use system;
 
 pub use primitives::{Blake2Hasher, H256};
-pub use runtime_primitives::{
+pub use sr_primitives::{
     testing::{Digest, DigestItem, Header, UintAuthorityId},
     traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize},
     weights::Weight,

src/governance/proposals.rs

@@ -1,6 +1,6 @@
 use codec::{Decode, Encode};
 use rstd::prelude::*;
-use runtime_primitives::{
+use sr_primitives::{
     print,
     traits::{Hash, SaturatedConversion, Zero},
 };
@@ -559,7 +559,7 @@ mod tests {
     use primitives::H256;
     // The testing primitives are very useful for avoiding having to work with signatures
     // or public keys. `u64` is used as the `AccountId` and no `Signature`s are requried.
-    use runtime_primitives::{
+    use sr_primitives::{
         testing::Header,
         traits::{BlakeTwo256, IdentityLookup},
         Perbill,

src/governance/stake.rs

@@ -1,6 +1,6 @@
 use codec::{Decode, Encode};
 use rstd::cmp::Ordering;
-use runtime_primitives::traits::SimpleArithmetic;
+use sr_primitives::traits::SimpleArithmetic;
 
 #[derive(Encode, Decode, Clone, Copy, Default, Debug)]
 pub struct Stake<Balance>

src/lib.rs

@@ -18,14 +18,14 @@ use codec::{Decode, Encode};
 use grandpa::fg_primitives;
 use grandpa::{AuthorityId as GrandpaId, AuthorityWeight as GrandpaWeight};
 use im_online::sr25519::AuthorityId as ImOnlineId;
-use primitives::{crypto::key_types, OpaqueMetadata};
+use primitives::OpaqueMetadata;
 use rstd::prelude::*;
-use runtime_primitives::curve::PiecewiseLinear;
-use runtime_primitives::traits::{
+use sr_primitives::curve::PiecewiseLinear;
+use sr_primitives::traits::{
     BlakeTwo256, Block as BlockT, IdentifyAccount, NumberFor, StaticLookup, Verify,
 };
-use runtime_primitives::weights::Weight;
-use runtime_primitives::{
+use sr_primitives::weights::Weight;
+use sr_primitives::{
     create_runtime_str, generic, impl_opaque_keys, transaction_validity::TransactionValidity,
     ApplyResult, MultiSignature,
 };
@@ -41,8 +41,8 @@ use version::RuntimeVersion;
 // A few exports that help ease life for downstream crates.
 pub use balances::Call as BalancesCall;
 #[cfg(any(feature = "std", test))]
-pub use runtime_primitives::BuildStorage;
-pub use runtime_primitives::{Perbill, Permill};
+pub use sr_primitives::BuildStorage;
+pub use sr_primitives::{Perbill, Permill};
 
 pub use srml_support::{
     construct_runtime, parameter_types, traits::Currency, traits::Imbalance, traits::Randomness,
@@ -90,7 +90,7 @@ pub type Credential = u64;
 pub mod opaque {
     use super::*;
 
-    pub use runtime_primitives::OpaqueExtrinsic as UncheckedExtrinsic;
+    pub use sr_primitives::OpaqueExtrinsic as UncheckedExtrinsic;
 
     /// Opaque block header type.
     pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
@@ -103,12 +103,9 @@ pub mod opaque {
 
     impl_opaque_keys! {
         pub struct SessionKeys {
-            #[id(key_types::GRANDPA)]
-            pub grandpa: GrandpaId,
-            #[id(key_types::BABE)]
-            pub babe: BabeId,
-            #[id(key_types::IM_ONLINE)]
-            pub im_online: ImOnlineId,
+            pub grandpa: Grandpa,
+            pub babe: Babe,
+            pub im_online: ImOnline,
         }
     }
 }
@@ -118,7 +115,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("joystream-node"),
     impl_name: create_runtime_str!("joystream-node"),
     authoring_version: 6,
-    spec_version: 1,
+    spec_version: 5,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
 };
@@ -299,12 +296,9 @@ type SessionHandlers = (Grandpa, Babe, ImOnline);
 
 impl_opaque_keys! {
     pub struct SessionKeys {
-        #[id(key_types::GRANDPA)]
-        pub grandpa: GrandpaId,
-        #[id(key_types::BABE)]
-        pub babe: BabeId,
-        #[id(key_types::IM_ONLINE)]
-        pub im_online: ImOnlineId,
+        pub grandpa: Grandpa,
+        pub babe: Babe,
+        pub im_online: ImOnline,
     }
 }
 
@@ -355,7 +349,7 @@ impl staking::Trait for Runtime {
     type Currency = Balances;
     type Time = Timestamp;
     type CurrencyToVote = currency::CurrencyToVoteHandler;
-    type OnRewardMinted = ();
+    type RewardRemainder = ();
     type Event = Event;
     type Slash = (); // where to send the slashed funds.
     type Reward = (); // rewards are minted from the void
@@ -367,12 +361,17 @@ impl staking::Trait for Runtime {
 
 type SubmitTransaction = TransactionSubmitter<ImOnlineId, Runtime, UncheckedExtrinsic>;
 
+parameter_types! {
+    pub const SessionDuration: BlockNumber = EPOCH_DURATION_IN_SLOTS as _;
+}
+
 impl im_online::Trait for Runtime {
     type AuthorityId = ImOnlineId;
     type Call = Call;
     type Event = Event;
     type SubmitTransaction = SubmitTransaction;
     type ReportUnresponsiveness = Offences;
+    type SessionDuration = SessionDuration;
 }
 
 impl offences::Trait for Runtime {

src/membership/members.rs

@@ -2,7 +2,7 @@ use crate::currency::{BalanceOf, GovernanceCurrency};
 use codec::{Codec, Decode, Encode};
 
 use rstd::prelude::*;
-use runtime_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic};
+use sr_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic};
 use srml_support::traits::{Currency, Get};
 use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, Parameter};
 

src/membership/mock.rs

@@ -6,7 +6,7 @@ pub use srml_support::traits::Currency;
 pub use system;
 
 pub use primitives::{Blake2Hasher, H256};
-pub use runtime_primitives::{
+pub use sr_primitives::{
     testing::{Digest, DigestItem, Header, UintAuthorityId},
     traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize},
     weights::Weight,

src/memo.rs

@@ -1,6 +1,6 @@
 use crate::currency::GovernanceCurrency;
 use rstd::prelude::*;
-use runtime_primitives::traits::Zero;
+use sr_primitives::traits::Zero;
 use srml_support::traits::Currency;
 use srml_support::{decl_event, decl_module, decl_storage, ensure};
 use system::{self, ensure_signed};

src/migration.rs

@@ -1,7 +1,7 @@
 use crate::forum;
 use crate::storage;
 use crate::VERSION;
-use runtime_primitives::print;
+use sr_primitives::print;
 use srml_support::{decl_event, decl_module, decl_storage};
 use sudo;
 use system;

src/roles/actors.rs

@@ -1,7 +1,7 @@
 use crate::currency::{BalanceOf, GovernanceCurrency};
 use codec::{Decode, Encode};
 use rstd::prelude::*;
-use runtime_primitives::traits::{Bounded, Zero};
+use sr_primitives::traits::{Bounded, Zero};
 use srml_support::traits::{
     Currency, LockIdentifier, LockableCurrency, WithdrawReason, WithdrawReasons,
 };

src/roles/mock.rs

@@ -7,7 +7,7 @@ pub use srml_support::traits::Currency;
 pub use system;
 
 pub use primitives::{Blake2Hasher, H256};
-pub use runtime_primitives::{
+pub use sr_primitives::{
     testing::{Digest, DigestItem, Header, UintAuthorityId},
     traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize},
     weights::Weight,

src/service_discovery/mock.rs

@@ -5,7 +5,7 @@ pub use crate::roles::actors;
 pub use crate::traits::Roles;
 
 pub use primitives::{Blake2Hasher, H256};
-pub use runtime_primitives::{
+pub use sr_primitives::{
     testing::{Digest, DigestItem, Header, UintAuthorityId},
     traits::{BlakeTwo256, IdentityLookup, OnFinalize},
     BuildStorage, Perbill,

src/storage/data_directory.rs

@@ -4,7 +4,7 @@ use crate::storage::data_object_type_registry::Trait as DOTRTrait;
 use crate::traits::{ContentIdExists, IsActiveDataObjectType, Roles};
 use codec::{Codec, Decode, Encode};
 use rstd::prelude::*;
-use runtime_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};
+use sr_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};
 use srml_support::{decl_event, decl_module, decl_storage, dispatch, ensure, Parameter};
 use system::{self, ensure_root, ensure_signed};
 

src/storage/data_object_storage_registry.rs

@@ -3,7 +3,7 @@ use crate::storage::data_directory::Trait as DDTrait;
 use crate::traits::{ContentHasStorage, ContentIdExists, Roles};
 use codec::{Codec, Decode, Encode};
 use rstd::prelude::*;
-use runtime_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};
+use sr_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};
 use srml_support::{decl_event, decl_module, decl_storage, ensure, Parameter};
 use system::{self, ensure_signed};
 

src/storage/data_object_type_registry.rs

@@ -1,7 +1,7 @@
 use crate::traits;
 use codec::{Codec, Decode, Encode};
 use rstd::prelude::*;
-use runtime_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};
+use sr_primitives::traits::{MaybeSerialize, Member, SimpleArithmetic};
 use srml_support::{decl_event, decl_module, decl_storage, Parameter};
 use system::ensure_root;
 

src/storage/mock.rs

@@ -9,7 +9,7 @@ use crate::traits;
 pub use system;
 
 pub use primitives::{Blake2Hasher, H256};
-pub use runtime_primitives::{
+pub use sr_primitives::{
     testing::{Digest, DigestItem, Header, UintAuthorityId},
     traits::{BlakeTwo256, Convert, IdentityLookup, OnFinalize},
     weights::Weight,

wasm_dockerfile

@@ -1,4 +1,4 @@
-FROM liuchong/rustup:1.37.0 AS builder
+FROM liuchong/rustup:1.41.1 AS builder
 LABEL description="Joystream wasm toolchain image"
 
 ENV TERM=xterm