Rearrange export structure to something a bit more convenient.

substrate/wasm-runtime/polkadot/src/runtime/consensus.rs

@@ -16,8 +16,8 @@
 
 //! Conensus module for runtime; manages the authority set ready for the native code.
 
-use runtime_support::prelude::*;
-use storable::StorageVec;
+use runtime_std::prelude::*;
+use support::StorageVec;
 use primitives::SessionKey;
 
 struct AuthorityStorageVec {}

substrate/wasm-runtime/polkadot/src/runtime/governance.rs

@@ -25,9 +25,9 @@
 //! At the end of the era, all validators approvals are tallied and if there are sufficient to pass
 //! the proposal then it is enacted. All items in storage concerning the proposal are reset.
 
-use runtime_support::prelude::*;
-use keyedvec::KeyedVec;
-use storable::{Storable, StorageVec, kill};
+use runtime_std::prelude::*;
+use codec::KeyedVec;
+use support::{Storable, StorageVec, kill};
 use primitives::{AccountID, Hash, BlockNumber, Proposal};
 use runtime::{staking, system, session};
 
@@ -105,7 +105,7 @@ pub fn end_of_an_era() {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use runtime_support::{with_externalities, twox_128};
+	use runtime_std::{with_externalities, twox_128};
 	use keyedvec::KeyedVec;
 	use joiner::Joiner;
 	use testing::{one, two, TestExternalities};

substrate/wasm-runtime/polkadot/src/runtime/session.rs

@@ -17,9 +17,9 @@
 //! Session manager: is told the validators and allows them to manage their session keys for the
 //! consensus module.
 
-use runtime_support::prelude::*;
-use keyedvec::KeyedVec;
-use storable::{kill, Storable, StorageVec};
+use runtime_std::prelude::*;
+use codec::KeyedVec;
+use support::{kill, Storable, StorageVec};
 use primitives::{AccountID, SessionKey, BlockNumber};
 use runtime::{system, staking, consensus};
 
@@ -118,7 +118,7 @@ fn rotate_session() {
 
 #[cfg(test)]
 mod tests {
-	use runtime_support::{with_externalities, twox_128};
+	use runtime_std::{with_externalities, twox_128};
 	use keyedvec::KeyedVec;
 	use joiner::Joiner;
 	use testing::{one, two, TestExternalities};

substrate/wasm-runtime/polkadot/src/runtime/staking.rs

@@ -16,10 +16,10 @@
 
 //! Staking manager: Handles balances and periodically determines the best set of validators.
 
-use runtime_support::prelude::*;
-use runtime_support::cell::RefCell;
-use keyedvec::KeyedVec;
-use storable::{Storable, StorageVec};
+use runtime_std::prelude::*;
+use runtime_std::cell::RefCell;
+use codec::KeyedVec;
+use support::{Storable, StorageVec};
 use primitives::{BlockNumber, AccountID};
 use runtime::{system, session, governance};
 
@@ -190,7 +190,7 @@ fn new_era() {
 
 #[cfg(test)]
 mod tests {
-	use runtime_support::{with_externalities, twox_128};
+	use runtime_std::{with_externalities, twox_128};
 	use keyedvec::KeyedVec;
 	use joiner::Joiner;
 	use testing::{one, two, TestExternalities};

substrate/wasm-runtime/polkadot/src/runtime/system.rs

@@ -17,14 +17,11 @@
 //! System manager: Handles all of the top-level stuff; executing block/transaction, setting code
 //! and depositing logs.
 
+use runtime_std::prelude::*;
+use runtime_std::{mem, print};
+use codec::KeyedVec;
+use support::{Hashable, Storable, with_env};
 use primitives::{Block, BlockNumber, Hash, UncheckedTransaction, TxOrder};
-use runtime_support::mem;
-use runtime_support::prelude::*;
-use runtime_support::print;
-use hashable::Hashable;
-use storable::Storable;
-use keyedvec::KeyedVec;
-use environment::with_env;
 use runtime::{staking, session};
 
 /// The current block number being processed. Set by `execute_block`.
@@ -120,7 +117,7 @@ mod tests {
 	use function::Function;
 	use keyedvec::KeyedVec;
 	use slicable::Slicable;
-	use runtime_support::{with_externalities, twox_128};
+	use runtime_std::{with_externalities, twox_128};
 	use primitives::{UncheckedTransaction, Transaction};
 	use statichex::StaticHexInto;
 	use runtime::{system, staking};

substrate/wasm-runtime/polkadot/src/runtime/timestamp.rs

@@ -16,7 +16,7 @@
 
 //! Timestamp manager: just handles the current timestamp.
 
-use storable::Storable;
+use support::Storable;
 
 /// Representation of a time.
 pub type Timestamp = u64;
@@ -35,7 +35,7 @@ pub fn set(now: Timestamp) {
 mod tests {
 	use joiner::Joiner;
 	use keyedvec::KeyedVec;
-	use runtime_support::{with_externalities, twox_128};
+	use runtime_std::{with_externalities, twox_128};
 	use runtime::timestamp;
 	use testing::TestExternalities;