Skip to content

Commit 3ea9d3b

Browse files
dvc94chdvc94ch
authored
Update to rc6. (paritytech#155)
* Update to rc6. * Fix clippy warnings.
1 parent eac2ce3 commit 3ea9d3b

File tree

11 files changed

+260
-253
lines changed

11 files changed

+260
-253
lines changed

‎Cargo.toml

+15-15
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@ thiserror = "1.0.20"
2525
futures = "0.3.5"
2626
jsonrpsee = { version = "0.1.0", features = ["ws"] }
2727
num-traits = { version = "0.2.12", default-features = false }
28-
serde = { version = "1.0.114", features = ["derive"] }
29-
serde_json = "1.0.56"
28+
serde = { version = "1.0.115", features = ["derive"] }
29+
serde_json = "1.0.57"
3030
url = "2.1.1"
3131
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive", "full"] }
3232

33-
frame-metadata = { version = "11.0.0-rc5", package = "frame-metadata" }
34-
frame-support = { version = "2.0.0-rc5", package = "frame-support" }
35-
sp-runtime = { version = "2.0.0-rc5", package = "sp-runtime" }
36-
sp-version = { version = "2.0.0-rc5", package = "sp-version" }
37-
pallet-indices = { version = "2.0.0-rc5", package = "pallet-indices" }
33+
frame-metadata = { version = "11.0.0-rc6", package = "frame-metadata" }
34+
frame-support = { version = "2.0.0-rc6", package = "frame-support" }
35+
sp-runtime = { version = "2.0.0-rc6", package = "sp-runtime" }
36+
sp-version = { version = "2.0.0-rc6", package = "sp-version" }
37+
pallet-indices = { version = "2.0.0-rc6", package = "pallet-indices" }
3838
hex = "0.4.2"
39-
sp-rpc = { version = "2.0.0-rc5", package = "sp-rpc" }
40-
sp-core = { version = "2.0.0-rc5", package = "sp-core" }
41-
sc-rpc-api = { version = "0.8.0-rc5", package = "sc-rpc-api" }
42-
sp-transaction-pool = { version = "2.0.0-rc5", package = "sp-transaction-pool" }
39+
sp-rpc = { version = "2.0.0-rc6", package = "sp-rpc" }
40+
sp-core = { version = "2.0.0-rc6", package = "sp-core" }
41+
sc-rpc-api = { version = "0.8.0-rc6", package = "sc-rpc-api" }
42+
sp-transaction-pool = { version = "2.0.0-rc6", package = "sp-transaction-pool" }
4343
substrate-subxt-client = { version = "0.3.0", path = "client", optional = true }
4444
substrate-subxt-proc-macro = { version = "0.11.0", path = "proc-macro" }
4545

4646
[dev-dependencies]
47-
async-std = { version = "1.6.2", features = ["attributes"] }
47+
async-std = { version = "1.6.3", features = ["attributes"] }
4848
env_logger = "0.7.1"
49-
frame-system = { version = "2.0.0-rc5", package = "frame-system" }
50-
pallet-balances = { version = "2.0.0-rc5", package = "pallet-balances" }
51-
sp-keyring = { version = "2.0.0-rc5", package = "sp-keyring" }
49+
frame-system = { version = "2.0.0-rc6", package = "frame-system" }
50+
pallet-balances = { version = "2.0.0-rc6", package = "pallet-balances" }
51+
sp-keyring = { version = "2.0.0-rc6", package = "sp-keyring" }
5252
substrate-subxt-client = { version = "0.3.0", path = "client" }
5353
tempdir = "0.3.7"
5454
test-node = { path = "test-node" }

‎client/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ description = "Embed a substrate node into your subxt application."
1212
keywords = ["parity", "substrate", "blockchain"]
1313

1414
[dependencies]
15-
async-std = "1.6.2"
15+
async-std = "1.6.3"
1616
futures = { version = "0.3.5", features = ["compat"] }
1717
futures01 = { package = "futures", version = "0.1.29" }
1818
jsonrpsee = "0.1.0"
1919
log = "0.4.11"
20-
sc-network = { version = "0.8.0-rc5", default-features = false }
21-
sc-service = { version = "0.8.0-rc5", default-features = false }
22-
serde_json = "1.0.56"
23-
sp-keyring = "2.0.0-rc5"
20+
sc-network = { version = "0.8.0-rc6", default-features = false }
21+
sc-service = { version = "0.8.0-rc6", default-features = false }
22+
serde_json = "1.0.57"
23+
sp-keyring = "2.0.0-rc6"
2424
thiserror = "1.0.20"
2525

2626
[dev-dependencies]
27-
async-std = { version = "1.6.2", features = ["attributes"] }
27+
async-std = { version = "1.6.3", features = ["attributes"] }
2828
env_logger = "0.7.1"
2929
substrate-subxt = { path = ".." }
3030
tempdir = "0.3.7"

‎client/src/lib.rs

+5-9
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ use sc_service::{
6464
use std::{
6565
future::Future,
6666
pin::Pin,
67-
sync::Arc,
6867
};
6968
use thiserror::Error;
7069

@@ -87,17 +86,16 @@ pub struct SubxtClient {
8786

8887
impl SubxtClient {
8988
/// Create a new client.
90-
pub fn new(mut task_manager: TaskManager, rpc: Arc<RpcHandlers>) -> Self {
89+
pub fn new(mut task_manager: TaskManager, rpc: RpcHandlers) -> Self {
9190
let (to_back, from_front) = mpsc::channel(4);
9291
let (to_front, from_back) = mpsc01::channel(4);
9392

9493
let session = RpcSession::new(to_front.clone());
95-
let session2 = session.clone();
9694
task::spawn(
9795
select(
9896
Box::pin(from_front.for_each(move |message: String| {
9997
let rpc = rpc.clone();
100-
let session = session2.clone();
98+
let session = session.clone();
10199
let mut to_front = to_front.clone().sink_compat();
102100
async move {
103101
let response = rpc.rpc_query(&session, &message).await;
@@ -122,11 +120,9 @@ impl SubxtClient {
122120
/// Creates a new client from a config.
123121
pub fn from_config<C: ChainSpec + 'static>(
124122
config: SubxtClientConfig<C>,
125-
builder: impl Fn(
126-
Configuration,
127-
) -> Result<(TaskManager, Arc<RpcHandlers>), ServiceError>,
123+
builder: impl Fn(Configuration) -> Result<(TaskManager, RpcHandlers), ServiceError>,
128124
) -> Result<Self, ServiceError> {
129-
let config = config.to_service_config();
125+
let config = config.into_service_config();
130126
let (task_manager, rpc_handlers) = (builder)(config)?;
131127
Ok(Self::new(task_manager, rpc_handlers))
132128
}
@@ -224,7 +220,7 @@ pub struct SubxtClientConfig<C: ChainSpec + 'static> {
224220

225221
impl<C: ChainSpec + 'static> SubxtClientConfig<C> {
226222
/// Creates a service configuration.
227-
pub fn to_service_config(self) -> Configuration {
223+
pub fn into_service_config(self) -> Configuration {
228224
let mut network = NetworkConfiguration::new(
229225
format!("{} (subxt client)", self.chain_spec.name()),
230226
"unknown",

‎proc-macro/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ proc-macro = true
1818
heck = "0.3.1"
1919
proc-macro2 = "1.0.19"
2020
proc-macro-crate = "0.1.5"
21-
proc-macro-error = "1.0.3"
21+
proc-macro-error = "1.0.4"
2222
quote = "1.0.7"
23-
syn = "1.0.35"
23+
syn = "1.0.38"
2424
synstructure = "0.12.4"
2525

2626
[dev-dependencies]
27-
async-std = { version = "1.6.2", features = ["attributes"] }
27+
async-std = { version = "1.6.3", features = ["attributes"] }
2828
codec = { package = "parity-scale-codec", version = "1.3.4", features = ["derive"] }
2929
env_logger = "0.7.1"
3030
pretty_assertions = "0.6.1"
31-
sp-keyring = "2.0.0-rc5"
31+
sp-keyring = "2.0.0-rc6"
3232
substrate-subxt = { path = ".." }
33-
trybuild = "1.0.30"
33+
trybuild = "1.0.32"
3434

3535
[[test]]
3636
name = "balances"

‎test-node/Cargo.toml

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "test-node"
3-
version = "2.0.0-rc5"
3+
version = "2.0.0"
44
authors = ["Anonymous"]
55
description = "Substrate Node template"
66
edition = "2018"
@@ -15,28 +15,28 @@ targets = ["x86_64-unknown-linux-gnu"]
1515
[dependencies]
1616
futures = "0.3.5"
1717
log = "0.4.11"
18-
structopt = "0.3.15"
18+
structopt = "0.3.16"
1919
parking_lot = "0.11.0"
2020

21-
sc-cli = { version = "0.8.0-rc5", features = ["wasmtime"] }
22-
sp-core = "2.0.0-rc5"
23-
sc-executor = { version = "0.8.0-rc5", features = ["wasmtime"] }
24-
sc-service = { version = "0.8.0-rc5", features = ["wasmtime"] }
25-
sp-inherents = "2.0.0-rc5"
26-
sc-transaction-pool = "2.0.0-rc5"
27-
sp-transaction-pool = "2.0.0-rc5"
28-
sc-network = "0.8.0-rc5"
29-
sc-consensus-aura = "0.8.0-rc5"
30-
sp-consensus-aura = "0.8.0-rc5"
31-
sp-consensus = "0.8.0-rc5"
32-
sc-consensus = "0.8.0-rc5"
33-
sc-finality-grandpa = "0.8.0-rc5"
34-
sp-finality-grandpa = "2.0.0-rc5"
35-
sc-client-api = "2.0.0-rc5"
36-
sp-runtime = "2.0.0-rc5"
37-
sc-basic-authorship = "0.8.0-rc5"
21+
sc-cli = { version = "0.8.0-rc6", features = ["wasmtime"] }
22+
sp-core = "2.0.0-rc6"
23+
sc-executor = { version = "0.8.0-rc6", features = ["wasmtime"] }
24+
sc-service = { version = "0.8.0-rc6", features = ["wasmtime"] }
25+
sp-inherents = "2.0.0-rc6"
26+
sc-transaction-pool = "2.0.0-rc6"
27+
sp-transaction-pool = "2.0.0-rc6"
28+
sc-network = "0.8.0-rc6"
29+
sc-consensus-aura = "0.8.0-rc6"
30+
sp-consensus-aura = "0.8.0-rc6"
31+
sp-consensus = "0.8.0-rc6"
32+
sc-consensus = "0.8.0-rc6"
33+
sc-finality-grandpa = "0.8.0-rc6"
34+
sp-finality-grandpa = "2.0.0-rc6"
35+
sc-client-api = "2.0.0-rc6"
36+
sp-runtime = "2.0.0-rc6"
37+
sc-basic-authorship = "0.8.0-rc6"
3838

39-
test-node-runtime = { version = "2.0.0-rc5", path = "runtime" }
39+
test-node-runtime = { path = "runtime" }
4040

4141
[build-dependencies]
42-
substrate-build-script-utils = "2.0.0-rc5"
42+
substrate-build-script-utils = "2.0.0-rc6"

‎test-node/runtime/Cargo.toml

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "test-node-runtime"
3-
version = "2.0.0-rc5"
3+
version = "2.0.0"
44
authors = ["Anonymous"]
55
edition = "2018"
66
license = "Unlicense"
@@ -13,43 +13,47 @@ targets = ["x86_64-unknown-linux-gnu"]
1313
[dependencies]
1414
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
1515

16-
aura = { version = "2.0.0-rc5", default-features = false, package = "pallet-aura" }
17-
balances = { version = "2.0.0-rc5", default-features = false, package = "pallet-balances" }
18-
frame-support = { version = "2.0.0-rc5", default-features = false }
19-
grandpa = { version = "2.0.0-rc5", default-features = false, package = "pallet-grandpa" }
20-
randomness-collective-flip = { version = "2.0.0-rc5", default-features = false, package = "pallet-randomness-collective-flip" }
21-
sudo = { version = "2.0.0-rc5", default-features = false, package = "pallet-sudo" }
22-
system = { version = "2.0.0-rc5", default-features = false, package = "frame-system" }
23-
timestamp = { version = "2.0.0-rc5", default-features = false, package = "pallet-timestamp" }
24-
transaction-payment = { version = "2.0.0-rc5", default-features = false, package = "pallet-transaction-payment" }
25-
frame-executive = { version = "2.0.0-rc5", default-features = false }
26-
serde = { version = "1.0.114", optional = true, features = ["derive"] }
27-
sp-api = { version = "2.0.0-rc5", default-features = false }
28-
sp-block-builder = { version = "2.0.0-rc5", default-features = false }
29-
sp-consensus-aura = { version = "0.8.0-rc5", default-features = false }
30-
sp-core = { version = "2.0.0-rc5", default-features = false }
31-
sp-inherents = { version = "2.0.0-rc5", default-features = false }
32-
sp-io = { version = "2.0.0-rc5", default-features = false }
33-
sp-offchain = { version = "2.0.0-rc5", default-features = false }
34-
sp-runtime = { version = "2.0.0-rc5", default-features = false }
35-
sp-session = { version = "2.0.0-rc5", default-features = false }
36-
sp-std = { version = "2.0.0-rc5", default-features = false }
37-
sp-transaction-pool = { version = "2.0.0-rc5", default-features = false }
38-
sp-version = { version = "2.0.0-rc5", default-features = false }
16+
frame-executive = { version = "2.0.0-rc6", default-features = false }
17+
frame-support = { version = "2.0.0-rc6", default-features = false }
18+
frame-system = { version = "2.0.0-rc6", default-features = false }
19+
pallet-aura = { version = "2.0.0-rc6", default-features = false }
20+
pallet-balances = { version = "2.0.0-rc6", default-features = false }
21+
pallet-grandpa = { version = "2.0.0-rc6", default-features = false }
22+
pallet-randomness-collective-flip = { version = "2.0.0-rc6", default-features = false }
23+
pallet-sudo = { version = "2.0.0-rc6", default-features = false }
24+
pallet-timestamp = { version = "2.0.0-rc6", default-features = false }
25+
pallet-transaction-payment = { version = "2.0.0-rc6", default-features = false }
26+
serde = { version = "1.0.115", optional = true, features = ["derive"] }
27+
sp-api = { version = "2.0.0-rc6", default-features = false }
28+
sp-block-builder = { version = "2.0.0-rc6", default-features = false }
29+
sp-consensus-aura = { version = "0.8.0-rc6", default-features = false }
30+
sp-core = { version = "2.0.0-rc6", default-features = false }
31+
sp-inherents = { version = "2.0.0-rc6", default-features = false }
32+
sp-io = { version = "2.0.0-rc6", default-features = false }
33+
sp-offchain = { version = "2.0.0-rc6", default-features = false }
34+
sp-runtime = { version = "2.0.0-rc6", default-features = false }
35+
sp-session = { version = "2.0.0-rc6", default-features = false }
36+
sp-std = { version = "2.0.0-rc6", default-features = false }
37+
sp-transaction-pool = { version = "2.0.0-rc6", default-features = false }
38+
sp-version = { version = "2.0.0-rc6", default-features = false }
3939

4040
[build-dependencies]
41-
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner" }
41+
substrate-wasm-builder-runner = "1.0.6"
4242

4343
[features]
4444
default = ["std"]
4545
std = [
46-
"aura/std",
47-
"balances/std",
4846
"codec/std",
4947
"frame-executive/std",
5048
"frame-support/std",
51-
"grandpa/std",
52-
"randomness-collective-flip/std",
49+
"frame-system/std",
50+
"pallet-aura/std",
51+
"pallet-balances/std",
52+
"pallet-grandpa/std",
53+
"pallet-randomness-collective-flip/std",
54+
"pallet-sudo/std",
55+
"pallet-timestamp/std",
56+
"pallet-transaction-payment/std",
5357
"serde",
5458
"sp-api/std",
5559
"sp-block-builder/std",
@@ -63,8 +67,4 @@ std = [
6367
"sp-std/std",
6468
"sp-transaction-pool/std",
6569
"sp-version/std",
66-
"sudo/std",
67-
"system/std",
68-
"timestamp/std",
69-
"transaction-payment/std",
7070
]

‎test-node/runtime/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// You should have received a copy of the GNU General Public License
1515
// along with substrate-subxt. If not, see <http://www.gnu.org/licenses/>.
1616

17-
use wasm_builder_runner::WasmBuilder;
17+
use substrate_wasm_builder_runner::WasmBuilder;
1818

1919
fn main() {
2020
WasmBuilder::new()

0 commit comments

Comments
 (0)