Refactor sr_primitives. (#3214)

* refactor sr_primitives.

* Fix try build error.

* Line-width

* Ui test.

* Final fixes.

* Fix build again.

* bring back ui test.

* Fix unsigned import.

* Another ui fix.

* Also refactor substrate-primitives

* Fix benchmarks.

* Fix doc test.

* fix doc tests
This commit is contained in:
Kian Paimani
2019-07-29 14:43:53 +02:00
committed by Bastian Köcher
parent cf80af9255
commit 79feb23a22
259 changed files with 667 additions and 665 deletions
+2 -2
View File
@@ -18,9 +18,9 @@ proc-macro-crate = "0.1.3"
client = { package = "substrate-client", path = "../client" }
test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" }
state_machine = { package = "substrate-state-machine", path = "../state-machine" }
runtime_primitives = { package = "sr-primitives", path = "../sr-primitives" }
sr-primitives = { path = "../sr-primitives" }
sr-version = { path = "../sr-version" }
substrate-primitives = { path = "../primitives" }
primitives = { package = "substrate-primitives", path = "../primitives" }
criterion = "0.2"
consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" }
codec = { package = "parity-codec", version = "4.1.1" }
@@ -19,7 +19,7 @@ use test_client::{
DefaultTestClientBuilderExt, TestClientBuilder,
TestClientBuilderExt, runtime::TestAPI,
};
use runtime_primitives::{generic::BlockId, traits::ProvideRuntimeApi};
use sr_primitives::{generic::BlockId, traits::ProvideRuntimeApi};
use state_machine::ExecutionStrategy;
fn sr_api_benchmark(c: &mut Criterion) {
+3 -3
View File
@@ -50,10 +50,10 @@ mod utils;
///
/// use version::create_runtime_str;
/// # extern crate test_client;
/// # extern crate runtime_primitives;
/// # extern crate substrate_primitives;
/// # extern crate sr_primitives;
/// # extern crate primitives;
/// #
/// # use runtime_primitives::traits::GetNodeBlockType;
/// # use sr_primitives::traits::GetNodeBlockType;
/// # use test_client::runtime::{Block, Header};
/// #
/// # /// The declaration of the `Runtime` type and the implementation of the `GetNodeBlockType`
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
use runtime_primitives::traits::{GetNodeBlockType, Block as BlockT};
use runtime_primitives::generic::BlockId;
use sr_primitives::traits::{GetNodeBlockType, Block as BlockT};
use sr_primitives::generic::BlockId;
use client::runtime_api::{self, RuntimeApiInfo};
use client::{error::Result, decl_runtime_apis, impl_runtime_apis};
use test_client::runtime::Block;
@@ -19,7 +19,7 @@ use test_client::{
DefaultTestClientBuilderExt, TestClientBuilder,
runtime::{TestAPI, DecodeFails, Transfer, Header},
};
use runtime_primitives::{
use sr_primitives::{
generic::BlockId,
traits::{ProvideRuntimeApi, Header as HeaderT, Hash as HashT},
};
@@ -1,4 +1,4 @@
use runtime_primitives::traits::GetNodeBlockType;
use sr_primitives::traits::GetNodeBlockType;
use test_client::runtime::Block;
use client::decl_runtime_apis;
@@ -1,4 +1,4 @@
use runtime_primitives::traits::Block as BlockT;
use sr_primitives::traits::Block as BlockT;
use client::decl_runtime_apis;
decl_runtime_apis! {
@@ -10,10 +10,10 @@ error: `Block: BlockT` generic parameter will be added automatically by the `dec
5 | pub trait Api<Block: BlockT> {
| ^^^^^^
warning: unused import: `runtime_primitives::traits::Block as BlockT`
warning: unused import: `sr_primitives::traits::Block as BlockT`
--> $DIR/declaring_old_block.rs:1:5
|
1 | use runtime_primitives::traits::Block as BlockT;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1 | use sr_primitives::traits::Block as BlockT;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: #[warn(unused_imports)] on by default
@@ -1,4 +1,4 @@
use runtime_primitives::traits::Block as BlockT;
use sr_primitives::traits::Block as BlockT;
use client::decl_runtime_apis;
decl_runtime_apis! {
@@ -4,10 +4,10 @@ error: `Block: BlockT` generic parameter will be added automatically by the `dec
5 | pub trait Api<B: BlockT> {
| ^^^^^^
warning: unused import: `runtime_primitives::traits::Block as BlockT`
warning: unused import: `sr_primitives::traits::Block as BlockT`
--> $DIR/declaring_own_block_with_different_name.rs:1:5
|
1 | use runtime_primitives::traits::Block as BlockT;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1 | use sr_primitives::traits::Block as BlockT;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: #[warn(unused_imports)] on by default
@@ -1,4 +1,4 @@
use runtime_primitives::traits::GetNodeBlockType;
use sr_primitives::traits::GetNodeBlockType;
use test_client::runtime::Block;
use client::{decl_runtime_apis, impl_runtime_apis};
@@ -1,4 +1,4 @@
use runtime_primitives::traits::GetNodeBlockType;
use sr_primitives::traits::GetNodeBlockType;
use test_client::runtime::Block;
use client::{decl_runtime_apis, impl_runtime_apis};
@@ -1,4 +1,4 @@
use runtime_primitives::traits::GetNodeBlockType;
use sr_primitives::traits::GetNodeBlockType;
use test_client::runtime::Block;
use client::{decl_runtime_apis, impl_runtime_apis};
@@ -1,4 +1,4 @@
use runtime_primitives::traits::GetNodeBlockType;
use sr_primitives::traits::GetNodeBlockType;
use test_client::runtime::Block;
use client::{decl_runtime_apis, impl_runtime_apis};
@@ -1,4 +1,4 @@
use runtime_primitives::traits::GetNodeBlockType;
use sr_primitives::traits::GetNodeBlockType;
use test_client::runtime::Block;
use client::{decl_runtime_apis, impl_runtime_apis};
@@ -1,4 +1,4 @@
use runtime_primitives::traits::GetNodeBlockType;
use sr_primitives::traits::GetNodeBlockType;
use test_client::runtime::Block;
use client::{decl_runtime_apis, impl_runtime_apis};