From cbf280c53d041797d2bbd5e8337ec82c553ba0c1 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 7 Jan 2020 15:48:10 +0000 Subject: [PATCH] Update to latest subxt --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- src/cmd/deploy.rs | 2 +- src/cmd/instantiate.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aecdd530..b04cc5a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,7 +209,7 @@ dependencies = [ "pwasm-utils 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-core 2.0.0 (git+https://github.com/paritytech/substrate/)", "structopt 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-subxt 0.4.0 (git+https://github.com/paritytech/substrate-subxt/?rev=80663ec6e351d6969029f0348c3219eb8b0fce1f)", + "substrate-subxt 0.4.0 (git+https://github.com/paritytech/substrate-subxt/?rev=b159d0dae1100dffcaa9f6f1eae57c62d1c31470)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2239,7 +2239,7 @@ dependencies = [ [[package]] name = "substrate-subxt" version = "0.4.0" -source = "git+https://github.com/paritytech/substrate-subxt/?rev=80663ec6e351d6969029f0348c3219eb8b0fce1f#80663ec6e351d6969029f0348c3219eb8b0fce1f" +source = "git+https://github.com/paritytech/substrate-subxt/?rev=b159d0dae1100dffcaa9f6f1eae57c62d1c31470#b159d0dae1100dffcaa9f6f1eae57c62d1c31470" dependencies = [ "frame-metadata 2.0.0 (git+https://github.com/paritytech/substrate/)", "frame-support 2.0.0 (git+https://github.com/paritytech/substrate/)", @@ -3150,7 +3150,7 @@ dependencies = [ "checksum strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22" "checksum strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" "checksum substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5" -"checksum substrate-subxt 0.4.0 (git+https://github.com/paritytech/substrate-subxt/?rev=80663ec6e351d6969029f0348c3219eb8b0fce1f)" = "" +"checksum substrate-subxt 0.4.0 (git+https://github.com/paritytech/substrate-subxt/?rev=b159d0dae1100dffcaa9f6f1eae57c62d1c31470)" = "" "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" "checksum subtle 2.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c65d530b10ccaeac294f349038a597e435b18fb456aadd0840a623f83b9e941" "checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" diff --git a/Cargo.toml b/Cargo.toml index 8d72f23e..f2c7e6fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ parity-wasm = "0.41" cargo_metadata = "0.9" sp-core = { git = "https://github.com/paritytech/substrate/", package = "sp-core", optional = true } -subxt = { git = "https://github.com/paritytech/substrate-subxt/", rev = "80663ec6e351d6969029f0348c3219eb8b0fce1f", package = "substrate-subxt", optional = true } +subxt = { git = "https://github.com/paritytech/substrate-subxt/", rev = "b159d0dae1100dffcaa9f6f1eae57c62d1c31470", package = "substrate-subxt", optional = true } tokio = { version = "0.1", optional = true } futures = { version = "0.1", optional = true } url = { version = "1.7", optional = true } diff --git a/src/cmd/deploy.rs b/src/cmd/deploy.rs index 5d528a61..3f3c1ec2 100644 --- a/src/cmd/deploy.rs +++ b/src/cmd/deploy.rs @@ -74,7 +74,7 @@ pub(crate) fn execute_deploy( .set_url(extrinsic_opts.url.clone()) .build() .and_then(|cli| cli.xt(signer, None)) - .and_then(move |xt| xt.submit_and_watch(contracts::put_code(gas_limit, code))); + .and_then(move |xt| xt.watch().submit(contracts::put_code(gas_limit, code))); let mut rt = tokio::runtime::Runtime::new()?; if let Ok(extrinsic_success) = rt.block_on(fut) { diff --git a/src/cmd/instantiate.rs b/src/cmd/instantiate.rs index ab00c49f..34de2c21 100644 --- a/src/cmd/instantiate.rs +++ b/src/cmd/instantiate.rs @@ -57,7 +57,7 @@ pub(crate) fn execute_instantiate( .build() .and_then(|cli| cli.xt(signer, None)) .and_then(move |xt| { - xt.submit_and_watch(contracts::instantiate::( + xt.watch().submit(contracts::instantiate::( endowment, gas_limit, code_hash, data.0, )) }); -- GitLab