Merge remote-tracking branch 'origin/master' into staking

client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "substrate-subxt-client"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["David Craven <david@craven.ch>", "Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
@@ -20,7 +20,7 @@ log = "0.4.8"
 sc-network = { version = "0.8.0-rc4", default-features = false }
 sc-service = { version = "0.8.0-rc4", default-features = false }
 serde_json = "1.0.55"
-sp-keyring = { version = "2.0.0-rc4", package = "sp-keyring" }
+sp-keyring = "2.0.0-rc4"
 thiserror = "1.0.20"
 
 [dev-dependencies]

client/src/lib.rs

@@ -213,7 +213,8 @@ fn start_subxt_client<C: ChainSpec + 'static, S: AbstractService>(
                 TaskType::Async => task::spawn(fut),
                 TaskType::Blocking => task::spawn_blocking(|| task::block_on(fut)),
             };
-        }).into(),
+        })
+        .into(),
         database: config.db,
         keystore: KeystoreConfig::InMemory,
         max_runtime_instances: 8,
@@ -243,6 +244,8 @@ fn start_subxt_client<C: ChainSpec + 'static, S: AbstractService>(
         tracing_targets: Default::default(),
         transaction_pool: Default::default(),
         wasm_method: Default::default(),
+        base_path: Default::default(),
+        informant_output_format: Default::default(),
     };
 
     log::info!("{}", service_config.impl_name);
@@ -332,6 +335,7 @@ mod tests {
             test_node::chain_spec::ChainSpec::from_json_bytes(bytes).unwrap();
         let tmp = TempDir::new("subxt-").expect("failed to create tempdir");
         let config = SubxtClientConfig {
+            // base_path:
             impl_name: "substrate-subxt-light-client",
             impl_version: "0.0.1",
             author: "David Craven",