From 45aa57bb604cd731f08680d45428196d8f190ab3 Mon Sep 17 00:00:00 2001 From: David Palm Date: Fri, 3 Dec 2021 18:07:40 +0100 Subject: [PATCH 1/4] Don't re-export sp-arithmetic Add sp-arithmetic to dev-dependencies Don't use any default features --- Cargo.toml | 7 +++---- src/lib.rs | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e7141690f1..171e1cd897 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,14 +34,14 @@ url = "2.2.1" subxt-macro = { version = "0.1.0", path = "macro" } -sp-arithmetic = { package = "sp-arithmetic", git = "https://github.com/paritytech/substrate/", branch = "master" } -sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate/", branch = "master" } -sp-runtime = { package = "sp-runtime", git = "https://github.com/paritytech/substrate/", branch = "master" } +sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } +sp-runtime = { package = "sp-runtime", git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } sp-version = { package = "sp-version", git = "https://github.com/paritytech/substrate/", branch = "master" } frame-metadata = "14.0.0" [dev-dependencies] +sp-arithmetic = { package = "sp-arithmetic", git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } assert_matches = "1.5.0" async-std = { version = "1.9.0", features = ["attributes", "tokio1"] } env_logger = "0.8.3" @@ -51,4 +51,3 @@ which = "4.0.2" test-runtime = { path = "test-runtime" } sp-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate/", branch = "master" } - diff --git a/src/lib.rs b/src/lib.rs index 4784d46600..dbd4dbeb2d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -45,7 +45,6 @@ pub use subxt_macro::subxt; pub use bitvec; pub use codec; -pub use sp_arithmetic; pub use sp_core; pub use sp_runtime; From a9ab6148f20342fcecd552aec3c95be9741eb363 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 6 Dec 2021 11:17:20 +0100 Subject: [PATCH 2/4] Update Cargo.toml Co-authored-by: Niklas Adolfsson --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 171e1cd897..3dd97cd3ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ sp-version = { package = "sp-version", git = "https://github.com/paritytech/subs frame-metadata = "14.0.0" [dev-dependencies] -sp-arithmetic = { package = "sp-arithmetic", git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } assert_matches = "1.5.0" async-std = { version = "1.9.0", features = ["attributes", "tokio1"] } env_logger = "0.8.3" From f83d8bb225ea2f4d84233d6fa5087d0ceabb6615 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 6 Dec 2021 11:17:26 +0100 Subject: [PATCH 3/4] Update Cargo.toml Co-authored-by: Niklas Adolfsson --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3dd97cd3ed..0c1f7ca72e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ url = "2.2.1" subxt-macro = { version = "0.1.0", path = "macro" } -sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } sp-runtime = { package = "sp-runtime", git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } sp-version = { package = "sp-version", git = "https://github.com/paritytech/substrate/", branch = "master" } From ab3db7f39fa665f5f4831619dea9cd6608b32b26 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 6 Dec 2021 11:17:33 +0100 Subject: [PATCH 4/4] Update Cargo.toml Co-authored-by: Niklas Adolfsson --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 0c1f7ca72e..604562f4c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ url = "2.2.1" subxt-macro = { version = "0.1.0", path = "macro" } sp-core = { git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } -sp-runtime = { package = "sp-runtime", git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate/", branch = "master", default-features = false } sp-version = { package = "sp-version", git = "https://github.com/paritytech/substrate/", branch = "master" } frame-metadata = "14.0.0"