Merge pull request #41 from interlay/greg/chore/upgrade-subxt

chore: upgrade jsonrpsee-v2 and subxt
interlay · Mar 10, 2021 · c3c26a5 · c3c26a5
2 parents 37c0664 + 401ae26
commit c3c26a5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
@@ -28,7 +28,7 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1
 sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" }
 
 [dev-dependencies]
-substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "c300c6c" }
+substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "b012f46" }
 tempdir = "0.3.7"
 btc-parachain = { git = "https://github.com/interlay/btc-parachain", branch = "dev", version = "0.5.0", features = ["aura-grandpa"] }
 btc-parachain-service = { git = "https://github.com/interlay/btc-parachain", branch = "dev", version = "0.5.0", features = ["aura-grandpa"] }

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -23,8 +23,8 @@ thiserror = "1.0"
 serde_json = "1.0.57"
 serde = "1.0.116"
 tokio = { version = "0.2.22", features = ["full"] }
-jsonrpsee-types = { git = "https://github.com/interlay/jsonrpsee", rev = "b994da4" }
-jsonrpsee-ws-client = { git = "https://github.com/interlay/jsonrpsee", rev = "b994da4" }
+jsonrpsee-types = { git = "https://github.com/interlay/jsonrpsee", rev = "0ee62c3" }
+jsonrpsee-ws-client = { git = "https://github.com/interlay/jsonrpsee", rev = "0ee62c3" }
 futures = "0.3.5"
 clap = "3.0.0-beta.2"
 log = "0.4.0"
@@ -40,15 +40,15 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "roc
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" }
 
 # Subxt dependencies
-substrate-subxt-proc-macro = { git = "https://github.com/interlay/substrate-subxt", rev = "c300c6c" }
-substrate-subxt = { git = "https://github.com/interlay/substrate-subxt", rev = "c300c6c" }
+substrate-subxt-proc-macro = { git = "https://github.com/interlay/substrate-subxt", rev = "b012f46" }
+substrate-subxt = { git = "https://github.com/interlay/substrate-subxt", rev = "b012f46" }
 
 # Polkadot dependencies
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" }
 parachain = { package = "polkadot-parachain", git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" }
 
 # Dependencies for the testing utils for integration tests
-substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "c300c6c", optional = true }
+substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "b012f46", optional = true }
 tempdir = {version = "0.3.7", optional = true }
 btc-parachain = { git = "https://github.com/interlay/btc-parachain", branch = "dev", version = "0.5.0", features = ["aura-grandpa"], optional = true }
 btc-parachain-service = { git = "https://github.com/interlay/btc-parachain", branch = "dev", version = "0.5.1", features = ["aura-grandpa"], optional = true }
@@ -122,7 +122,7 @@ version = "0.5.0"
 package = "exchange-rate-oracle"
 
 [dev-dependencies]
-substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "c300c6c" }
+substrate-subxt-client = { git = "https://github.com/interlay/substrate-subxt", rev = "b012f46" }
 tempdir = "0.3.7"
 btc-parachain = { git = "https://github.com/interlay/btc-parachain", branch = "dev", version = "0.5.0", features = ["aura-grandpa"] }
 btc-parachain-service = { git = "https://github.com/interlay/btc-parachain", branch = "dev", version = "0.5.0", features = ["aura-grandpa"] }
diff --git a/runtime/src/rpc.rs b/runtime/src/rpc.rs
@@ -95,8 +95,8 @@ impl PolkaBtcProvider {
             connection_timeout: Duration::from_secs(10),
             origin: None,
             handshake_url: path.into(),
-            max_concurrent_requests_capacity: 256,
-            max_notifs_per_subscription_capacity: 128,
+            max_concurrent_requests: 256,
+            max_notifs_per_subscription: 128,
         };
         let client = WsClient::new(config).await?;
         Self::new(client, signer).await
@@ -182,7 +182,7 @@ impl PolkaBtcProvider {
             EventTypeRegistry::new(),
         );
 
-        let mut sub = EventSubscription::<PolkaBtcRuntime, _>::new(sub, &decoder);
+        let mut sub = EventSubscription::<PolkaBtcRuntime>::new(sub, &decoder);
         loop {
             match sub.next().await {
                 Some(Err(err)) => on_error(err), // report error
@@ -216,7 +216,7 @@ impl PolkaBtcProvider {
             EventTypeRegistry::new(),
         );
 
-        let mut sub = EventSubscription::<PolkaBtcRuntime, _>::new(sub, &decoder);
+        let mut sub = EventSubscription::<PolkaBtcRuntime>::new(sub, &decoder);
         sub.filter_event::<T>();
 
         let (tx, mut rx) = futures::channel::mpsc::channel::<T>(32);