runtime: Restore tests.

runtime-modules/content-working-group/src/lib.rs

@@ -22,10 +22,10 @@ use serde::{Deserialize, Serialize};
 use codec::{Decode, Encode};
 use frame_support::traits::{Currency, ExistenceRequirement, WithdrawReasons};
 use frame_support::{decl_event, decl_module, decl_storage, ensure};
+use rstd::borrow::ToOwned;
 use rstd::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
 use rstd::vec;
 use rstd::vec::Vec;
-use rstd::borrow::ToOwned;
 use sp_arithmetic::traits::{One, Zero};
 use system::{ensure_root, ensure_signed};
 

runtime-modules/forum/src/lib.rs

@@ -15,11 +15,11 @@ pub type DispatchResult = Result<(), &'static str>;
 
 use codec::{Codec, Decode, Encode};
 use frame_support::{decl_event, decl_module, decl_storage, ensure, Parameter};
-use sp_arithmetic::traits::{BaseArithmetic, One};
-use sp_runtime::traits::{MaybeSerialize, Member};
+use rstd::borrow::ToOwned;
 use rstd::vec;
 use rstd::vec::Vec;
-use rstd::borrow::ToOwned;
+use sp_arithmetic::traits::{BaseArithmetic, One};
+use sp_runtime::traits::{MaybeSerialize, Member};
 
 mod mock;
 mod tests;

runtime-modules/governance/src/council.rs

@@ -1,8 +1,8 @@
 use frame_support::{debug, decl_event, decl_module, decl_storage, ensure};
-use sp_arithmetic::traits::{One, Zero};
-use system::ensure_root;
 use rstd::vec;
 use rstd::vec::Vec;
+use sp_arithmetic::traits::{One, Zero};
+use system::ensure_root;
 
 pub use super::election::{self, CouncilElected, Seat, Seats};
 pub use common::currency::{BalanceOf, GovernanceCurrency};

runtime-modules/membership/src/lib.rs

@@ -12,12 +12,12 @@ mod tests;
 use codec::{Codec, Decode, Encode};
 use frame_support::traits::Currency;
 use frame_support::{decl_event, decl_module, decl_storage, ensure, Parameter};
+use rstd::borrow::ToOwned;
+use rstd::vec;
+use rstd::vec::Vec;
 use sp_arithmetic::traits::{BaseArithmetic, One};
 use sp_runtime::traits::{MaybeSerialize, Member};
 use system::{ensure_root, ensure_signed};
-use rstd::vec;
-use rstd::vec::Vec;
-use rstd::borrow::ToOwned;
 
 use common::currency::{BalanceOf, GovernanceCurrency};
 

runtime-modules/memo/src/lib.rs

@@ -3,8 +3,8 @@
 
 use frame_support::traits::Currency;
 use frame_support::{decl_event, decl_module, decl_storage, ensure};
-use sp_arithmetic::traits::Zero;
 use rstd::vec::Vec;
+use sp_arithmetic::traits::Zero;
 use system::ensure_signed;
 
 use common::currency::GovernanceCurrency;

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

@@ -1,9 +1,9 @@
 #![warn(missing_docs)]
 
 use codec::{Decode, Encode};
+use rstd::vec::Vec;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
-use rstd::vec::Vec;
 
 /// Represents a discussion thread
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]

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

@@ -134,9 +134,9 @@ use frame_support::traits::{Currency, Get};
 use frame_support::{
     decl_error, decl_event, decl_module, decl_storage, ensure, print, Parameter, StorageDoubleMap,
 };
+use rstd::vec::Vec;
 use sp_arithmetic::traits::Zero;
 use system::{ensure_root, RawOrigin};
-use rstd::vec::Vec;
 
 use common::origin::ActorOriginValidator;
 

runtime-modules/proposals/engine/src/types/mod.rs

@@ -4,12 +4,12 @@
 #![warn(missing_docs)]
 
 use codec::{Decode, Encode};
+use frame_support::dispatch::DispatchResult;
+use frame_support::traits::Currency;
+use rstd::boxed::Box;
 use rstd::cmp::PartialOrd;
 use rstd::ops::Add;
 use rstd::vec::Vec;
-use rstd::boxed::Box;
-use frame_support::dispatch::DispatchResult;
-use frame_support::traits::Currency;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_runtime::Perbill;

runtime-modules/proposals/engine/src/types/proposal_statuses.rs

@@ -1,9 +1,9 @@
 #![warn(missing_docs)]
 
 use codec::{Decode, Encode};
+use rstd::vec::Vec;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
-use rstd::vec::Vec;
 
 use crate::ActiveStake;
 

runtime-modules/storage/src/data_object_storage_registry.rs

@@ -25,9 +25,9 @@
 use codec::{Codec, Decode, Encode};
 use frame_support::dispatch::DispatchResult;
 use frame_support::{decl_error, decl_event, decl_module, decl_storage, ensure, Parameter};
+use rstd::vec::Vec;
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_runtime::traits::{MaybeSerialize, Member};
-use rstd::vec::Vec;
 
 use crate::data_directory::{self, ContentIdExists};
 use crate::{StorageProviderId, StorageWorkingGroup, StorageWorkingGroupInstance};

runtime-modules/storage/src/data_object_type_registry.rs

@@ -26,9 +26,9 @@ use codec::{Codec, Decode, Encode};
 use frame_support::dispatch::DispatchError;
 use frame_support::weights::Weight;
 use frame_support::{decl_error, decl_event, decl_module, decl_storage, Parameter};
+use rstd::vec::Vec;
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_runtime::traits::{MaybeSerialize, Member};
-use rstd::vec::Vec;
 
 use crate::{StorageWorkingGroup, StorageWorkingGroupInstance};
 

runtime-modules/working-group/src/lib.rs

@@ -57,8 +57,8 @@ use frame_support::storage::IterableStorageMap;
 use frame_support::traits::{Currency, ExistenceRequirement, Get, Imbalance, WithdrawReasons};
 use frame_support::{decl_event, decl_module, decl_storage, ensure, print, StorageValue};
 use rstd::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
-use rstd::vec::Vec;
 use rstd::vec;
+use rstd::vec::Vec;
 use sp_arithmetic::traits::{Bounded, One, Zero};
 use system::{ensure_root, ensure_signed};
 

runtime/src/integration/proposals/council_origin_validator.rs

@@ -51,7 +51,7 @@ mod tests {
 
     type Council = governance::council::Module<Runtime>;
 
-    fn initial_test_ext() -> runtime_io::TestExternalities {
+    fn initial_test_ext() -> sp_io::TestExternalities {
         let t = system::GenesisConfig::default()
             .build_storage::<Runtime>()
             .unwrap();

runtime/src/lib.rs

@@ -27,11 +27,11 @@ use frame_support::{
 use pallet_grandpa::fg_primitives;
 use pallet_grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList};
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
+use rstd::boxed::Box;
+use rstd::vec::Vec;
 use sp_api::impl_runtime_apis;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_core::crypto::KeyTypeId;
-use rstd::vec::Vec;
-use rstd::boxed::Box;
 use sp_core::OpaqueMetadata;
 use sp_runtime::curve::PiecewiseLinear;
 use sp_runtime::traits::{
@@ -44,8 +44,8 @@ use sp_runtime::{
     ApplyExtrinsicResult, MultiSignature,
 };
 #[cfg(feature = "std")]
-use sp_version::{NativeVersion};
-use sp_version::{RuntimeVersion};
+use sp_version::NativeVersion;
+use sp_version::RuntimeVersion;
 use system::EnsureRoot;
 
 use integration::proposals::{CouncilManager, ExtrinsicProposalEncoder, MembershipOriginValidator};

runtime/src/tests/proposals_integration/mod.rs

@@ -5,27 +5,26 @@
 mod working_group_proposals;
 
 use crate::{BlockNumber, ProposalCancellationFee, Runtime};
-use governance::election_params::ElectionParameters;
 use codec::Encode;
+use governance::election_params::ElectionParameters;
 use membership;
 use proposals_engine::{
-    ActiveStake, ApprovedProposalStatus, BalanceOf, Error, FinalizationData, Proposal,
+    ActiveStake, ApprovedProposalStatus, BalanceOf, FinalizationData, Proposal,
     ProposalDecisionStatus, ProposalParameters, ProposalStatus, VoteKind, VotersParameters,
     VotingResults,
 };
 
-use frame_support::dispatch::{DispatchResult};
-use sp_runtime::traits::{OnFinalize, OnInitialize};
+use frame_support::dispatch::{DispatchError, DispatchResult};
+use frame_support::traits::{Currency, OnFinalize, OnInitialize};
+use frame_support::{StorageMap, StorageValue};
 use sp_runtime::AccountId32;
-use frame_support::traits::Currency;
-use frame_support::{IterableStorageMap, StorageValue};
 use system::RawOrigin;
 
 use super::initial_test_ext;
 
 use crate::CouncilManager;
 
-pub type Balances = balances::Module<Runtime>;
+pub type Balances = pallet_balances::Module<Runtime>;
 pub type System = system::Module<Runtime>;
 pub type Membership = membership::Module<Runtime>;
 pub type ProposalsEngine = proposals_engine::Module<Runtime>;
@@ -77,7 +76,7 @@ pub(crate) fn increase_total_balance_issuance_using_account_id(
     account_id: AccountId32,
     balance: u128,
 ) {
-    type Balances = balances::Module<Runtime>;
+    type Balances = pallet_balances::Module<Runtime>;
     let initial_balance = Balances::total_issuance();
     {
         let _ = <Runtime as stake::Trait>::Currency::deposit_creating(&account_id, balance);
@@ -121,11 +120,11 @@ impl VoteGenerator {
         self.vote_and_assert(vote_kind, Ok(()));
     }
 
-    fn vote_and_assert(&mut self, vote_kind: VoteKind, expected_result: DispatchResult<Error>) {
+    fn vote_and_assert(&mut self, vote_kind: VoteKind, expected_result: DispatchResult) {
         assert_eq!(self.vote(vote_kind.clone()), expected_result);
     }
 
-    fn vote(&mut self, vote_kind: VoteKind) -> DispatchResult<Error> {
+    fn vote(&mut self, vote_kind: VoteKind) -> DispatchResult {
         if self.auto_increment_voter_id {
             self.current_account_id_seed += 1;
             self.current_voter_id += 1;
@@ -213,7 +212,7 @@ impl DummyProposalFixture {
         }
     }
 
-    fn create_proposal_and_assert(self, result: Result<u32, Error>) -> Option<u32> {
+    fn create_proposal_and_assert(self, result: Result<u32, DispatchError>) -> Option<u32> {
         let proposal_id_result = ProposalsEngine::create_proposal(
             self.account_id,
             self.proposer_id,
@@ -252,7 +251,7 @@ impl CancelProposalFixture {
         }
     }
 
-    fn cancel_and_assert(self, expected_result: DispatchResult<Error>) {
+    fn cancel_and_assert(self, expected_result: DispatchResult) {
         assert_eq!(
             ProposalsEngine::cancel_proposal(
                 self.origin.into(),
@@ -361,9 +360,7 @@ fn proposal_reset_succeeds() {
         vote_generator.vote_and_assert_ok(VoteKind::Abstain);
         vote_generator.vote_and_assert_ok(VoteKind::Slash);
 
-        assert!(<proposals_engine::ActiveProposalIds<Runtime>>::exists(
-            proposal_id
-        ));
+        assert!(<proposals_engine::ActiveProposalIds<Runtime>>::contains_key(proposal_id));
 
         // check
         let proposal = ProposalsEngine::proposals(proposal_id);
@@ -445,7 +442,7 @@ fn elect_single_councilor() {
 
 struct CodexProposalTestFixture<SuccessfulCall>
 where
-    SuccessfulCall: Fn() -> DispatchResult<proposals_codex::Error>,
+    SuccessfulCall: Fn() -> DispatchResult,
 {
     successful_call: SuccessfulCall,
     member_id: u64,
@@ -456,7 +453,7 @@ where
 
 impl<SuccessfulCall> CodexProposalTestFixture<SuccessfulCall>
 where
-    SuccessfulCall: Fn() -> DispatchResult<proposals_codex::Error>,
+    SuccessfulCall: Fn() -> DispatchResult,
 {
     fn default_for_call(call: SuccessfulCall) -> Self {
         Self {
@@ -502,7 +499,7 @@ where
 
 impl<SuccessfulCall> CodexProposalTestFixture<SuccessfulCall>
 where
-    SuccessfulCall: Fn() -> DispatchResult<proposals_codex::Error>,
+    SuccessfulCall: Fn() -> DispatchResult,
 {
     fn call_extrinsic_and_assert(&self) {
         let account_id: [u8; 32] = [self.member_id as u8; 32];
@@ -620,17 +617,12 @@ fn spending_proposal_execution_succeeds() {
         })
         .with_member_id(member_id as u64);
 
-        assert_eq!(
-            Balances::free_balance::<AccountId32>(target_account_id.clone().into()),
-            0
-        );
+        let converted_account_id: AccountId32 = target_account_id.clone().into();
+        assert_eq!(Balances::free_balance(converted_account_id.clone()), 0);
 
         codex_extrinsic_test_fixture.call_extrinsic_and_assert();
 
-        assert_eq!(
-            Balances::free_balance::<AccountId32>(target_account_id.into()),
-            new_balance
-        );
+        assert_eq!(Balances::free_balance(converted_account_id), new_balance);
     });
 }
 
@@ -705,7 +697,7 @@ fn set_validator_count_proposal_execution_succeeds() {
         let account_id: [u8; 32] = [member_id; 32];
 
         let new_validator_count = 8;
-        assert_eq!(<staking::ValidatorCount>::get(), 0);
+        assert_eq!(<pallet_staking::ValidatorCount>::get(), 0);
 
         let codex_extrinsic_test_fixture = CodexProposalTestFixture::default_for_call(|| {
             ProposalCodex::create_set_validator_count_proposal(
@@ -719,6 +711,6 @@ fn set_validator_count_proposal_execution_succeeds() {
         });
         codex_extrinsic_test_fixture.call_extrinsic_and_assert();
 
-        assert_eq!(<staking::ValidatorCount>::get(), new_validator_count);
+        assert_eq!(<pallet_staking::ValidatorCount>::get(), new_validator_count);
     });
 }

runtime/src/tests/proposals_integration/working_group_proposals.rs

@@ -29,7 +29,7 @@ fn add_opening(
     assert!(!<working_group::OpeningById<
         Runtime,
         StorageWorkingGroupInstance,
-    >>::exists(opening_id));
+    >>::contains_key(opening_id));
 
     let codex_extrinsic_test_fixture = CodexProposalTestFixture::default_for_call(|| {
         ProposalCodex::create_add_working_group_leader_opening_proposal(
@@ -288,7 +288,7 @@ fn create_add_working_group_leader_opening_proposal_execution_succeeds() {
         assert!(!<working_group::OpeningById<
             Runtime,
             StorageWorkingGroupInstance,
-        >>::exists(next_opening_id));
+        >>::contains_key(next_opening_id));
 
         let opening_id = add_opening(
             member_id,
@@ -305,7 +305,7 @@ fn create_add_working_group_leader_opening_proposal_execution_succeeds() {
         assert!(<working_group::OpeningById<
             Runtime,
             StorageWorkingGroupInstance,
-        >>::exists(opening_id));
+        >>::contains_key(opening_id));
     });
 }
 
@@ -461,7 +461,7 @@ fn create_decrease_group_leader_stake_proposal_execution_succeeds() {
         let leader_worker_id = StorageWorkingGroup::current_lead().unwrap();
 
         let stake_id = 1;
-        let old_balance = Balances::free_balance::<&AccountId32>(&account_id.into());
+        let old_balance = Balances::free_balance(&account_id.into());
         let old_stake = <stake::Module<Runtime>>::stakes(stake_id);
 
         assert_eq!(get_stake_balance(old_stake), stake_amount);
@@ -475,7 +475,7 @@ fn create_decrease_group_leader_stake_proposal_execution_succeeds() {
             4,
         );
 
-        let new_balance = Balances::free_balance::<&AccountId32>(&account_id.into());
+        let new_balance = Balances::free_balance(&account_id.into());
         let new_stake = <stake::Module<Runtime>>::stakes(stake_id);
 
         assert_eq!(
@@ -542,7 +542,7 @@ fn create_slash_group_leader_stake_proposal_execution_succeeds() {
         let leader_worker_id = StorageWorkingGroup::current_lead().unwrap();
 
         let stake_id = 1;
-        let old_balance = Balances::free_balance::<&AccountId32>(&account_id.into());
+        let old_balance = Balances::free_balance(&account_id.into());
         let old_stake = <stake::Module<Runtime>>::stakes(stake_id);
 
         assert_eq!(get_stake_balance(old_stake), stake_amount);
@@ -556,7 +556,7 @@ fn create_slash_group_leader_stake_proposal_execution_succeeds() {
             4,
         );
 
-        let new_balance = Balances::free_balance::<&AccountId32>(&account_id.into());
+        let new_balance = Balances::free_balance(&account_id.into());
         let new_stake = <stake::Module<Runtime>>::stakes(stake_id);
 
         assert_eq!(
@@ -652,7 +652,7 @@ fn create_set_group_leader_reward_proposal_execution_succeeds() {
         let worker = StorageWorkingGroup::worker_by_id(leader_worker_id);
         let relationship_id = worker.reward_relationship.unwrap();
 
-        let relationship = recurringrewards::RewardRelationships::<Runtime>::get(relationship_id);
+        let relationship = recurring_rewards::RewardRelationships::<Runtime>::get(relationship_id);
         assert_eq!(relationship.amount_per_payout, old_reward_amount);
 
         let new_reward_amount = 999;
@@ -664,7 +664,7 @@ fn create_set_group_leader_reward_proposal_execution_succeeds() {
             5,
         );
 
-        let relationship = recurringrewards::RewardRelationships::<Runtime>::get(relationship_id);
+        let relationship = recurring_rewards::RewardRelationships::<Runtime>::get(relationship_id);
         assert_eq!(relationship.amount_per_payout, new_reward_amount);
     });
 }
@@ -734,7 +734,7 @@ fn create_terminate_group_leader_role_proposal_execution_succeeds() {
         let leader_worker_id = StorageWorkingGroup::current_lead().unwrap();
 
         let stake_id = 1;
-        let old_balance = Balances::free_balance::<&AccountId32>(&account_id.into());
+        let old_balance = Balances::free_balance(&account_id.into());
         let old_stake = <stake::Module<Runtime>>::stakes(stake_id);
 
         assert_eq!(get_stake_balance(old_stake), stake_amount);
@@ -743,7 +743,7 @@ fn create_terminate_group_leader_role_proposal_execution_succeeds() {
 
         assert!(StorageWorkingGroup::current_lead().is_none());
 
-        let new_balance = Balances::free_balance::<&AccountId32>(&account_id.into());
+        let new_balance = Balances::free_balance(&account_id.into());
         let new_stake = <stake::Module<Runtime>>::stakes(stake_id);
 
         assert_eq!(new_stake.staking_status, stake::StakingStatus::NotStaked);
@@ -816,7 +816,7 @@ fn create_terminate_group_leader_role_proposal_with_slashing_execution_succeeds(
         let leader_worker_id = StorageWorkingGroup::current_lead().unwrap();
 
         let stake_id = 1;
-        let old_balance = Balances::free_balance::<&AccountId32>(&account_id.into());
+        let old_balance = Balances::free_balance(&account_id.into());
         let old_stake = <stake::Module<Runtime>>::stakes(stake_id);
 
         assert_eq!(get_stake_balance(old_stake), stake_amount);
@@ -825,7 +825,7 @@ fn create_terminate_group_leader_role_proposal_with_slashing_execution_succeeds(
 
         assert!(StorageWorkingGroup::current_lead().is_none());
 
-        let new_balance = Balances::free_balance::<&AccountId32>(&account_id.into());
+        let new_balance = Balances::free_balance(&account_id.into());
         let new_stake = <stake::Module<Runtime>>::stakes(stake_id);
 
         assert_eq!(new_stake.staking_status, stake::StakingStatus::NotStaked);

runtime/src/tests/storage_integration.rs

@@ -2,7 +2,7 @@ use super::initial_test_ext;
 use crate::integration::storage::StorageProviderHelper;
 use crate::Runtime;
 
-use srml_support::{StorageLinkedMap, StorageMap};
+use frame_support::StorageMap;
 use working_group::{Instance2, Worker};
 
 #[test]