Rearrange export structure to something a bit more convenient.

substrate/wasm-runtime/polkadot/src/primitives/block.rs

@@ -16,10 +16,8 @@
 
 //! Block type.
 
-use runtime_support::prelude::*;
-use streamreader::StreamReader;
-use joiner::Joiner;
-use slicable::{Slicable, NonTrivialSlicable};
+use runtime_std::prelude::*;
+use codec::{StreamReader, Joiner, Slicable, NonTrivialSlicable};
 use primitives::{Header, UncheckedTransaction};
 
 /// A Polkadot relay chain block.

substrate/wasm-runtime/polkadot/src/primitives/digest.rs

@@ -16,7 +16,7 @@
 
 //! Digest type.
 
-use runtime_support::prelude::*;
+use runtime_std::prelude::*;
 
 #[derive(Clone, Default)]
 #[cfg_attr(feature = "with-std", derive(PartialEq, Debug))]

substrate/wasm-runtime/polkadot/src/primitives/function.rs

@@ -17,7 +17,7 @@
 //! Function data: This describes a function that can be called from an external transaction.
 
 use primitives::AccountID;
-use streamreader::StreamReader;
+use codec::StreamReader;
 use runtime::{staking, session, timestamp, governance};
 
 /// Public functions that can be dispatched to.

substrate/wasm-runtime/polkadot/src/primitives/header.rs

@@ -16,11 +16,9 @@
 
 //! Block header type.
 
-use runtime_support::prelude::*;
-use streamreader::StreamReader;
-use joiner::Joiner;
-use slicable::{Slicable, NonTrivialSlicable};
-use runtime_support::mem;
+use runtime_std::prelude::*;
+use codec::{StreamReader, Joiner, Slicable, NonTrivialSlicable};
+use runtime_std::mem;
 use primitives::{BlockNumber, Hash, Digest};
 
 #[derive(Clone)]

substrate/wasm-runtime/polkadot/src/primitives/proposal.rs

@@ -17,11 +17,9 @@
 //! Proposal: This describes a combination of a function ID and data that can be used to call into
 //! an internal function.
 
-use runtime_support::prelude::*;
-use runtime_support::mem;
-use slicable::Slicable;
-use joiner::Joiner;
-use streamreader::StreamReader;
+use runtime_std::prelude::*;
+use runtime_std::mem;
+use codec::{Slicable, Joiner, StreamReader};
 use runtime::{system, governance, staking, session};
 
 /// Internal functions that can be dispatched to.

substrate/wasm-runtime/polkadot/src/primitives/tests.rs

@@ -17,10 +17,9 @@
 //! Tests.
 
 use super::*;
-use runtime_support::prelude::*;
-use joiner::Joiner;
-use slicable::{Slicable, NonTrivialSlicable};
-use function::Function;
+use runtime_std::prelude::*;
+use codec::{Joiner, Slicable};
+use primitives::Function;
 
 #[test]
 fn serialise_transaction_works() {

substrate/wasm-runtime/polkadot/src/primitives/transaction.rs

@@ -16,12 +16,10 @@
 
 //! Transaction type.
 
-use runtime_support::prelude::*;
-use streamreader::StreamReader;
-use joiner::Joiner;
-use slicable::{Slicable, NonTrivialSlicable};
+use runtime_std::prelude::*;
+use codec::{StreamReader, Joiner, Slicable, NonTrivialSlicable};
 use primitives::{AccountID, TxOrder, Function};
-use runtime_support::mem;
+use runtime_std::mem;
 
 /// A vetted and verified transaction from the external world.
 #[cfg_attr(feature = "with-std", derive(PartialEq, Debug))]

substrate/wasm-runtime/polkadot/src/primitives/uncheckedtransaction.rs

@@ -16,12 +16,10 @@
 
 //! Unchecked Transaction type.
 
-use slicable::{Slicable, NonTrivialSlicable};
-use streamreader::StreamReader;
-use joiner::Joiner;
+use runtime_std::{mem, ed25519_verify};
+use runtime_std::prelude::*;
+use codec::{Slicable, NonTrivialSlicable, StreamReader, Joiner};
 use primitives::Transaction;
-use runtime_support::{mem, ed25519_verify};
-use runtime_support::prelude::*;
 
 #[cfg(feature = "with-std")]
 use std::fmt;