pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-21 01:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

companion for #8783 - jsonrpsee (#4344)

Browse Source 
* add jsonrpsee glue code

* diener --substrate dp-jsonrpsee-integration-2

* cargo fmt

* update substrate

* fix build

* update substrate

* fix tests

* update substrate

* update substrate

* revert Cargo.toml

* revert changes in Cargo.toml

* jsonrpsee v0.11

* fix staking miner

* chore: update jsonrpsee v0.12

* update companion

* update companion

* fix changes in substrate

* revert requires_full_sync removal

* fix: read WS address from polkadot output

* fit nits

* fix more nits

* update lockfile for {"substrate"}

* cargo fmt

Co-authored-by: parity-processbot <>
This commit is contained in:
Niklas Adolfsson
2022-05-10 12:13:38 +02:00
committed by GitHub
parent 2a89e5612b
commit 804d0f38a5
20 changed files with 496 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/utils/staking-miner/src/monitor.rs
-15
View File
@@ -139,12 +139,6 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! {
maybe_rp = subscription.next() => {
match maybe_rp {
Some(Ok(r)) => r,
// Custom `jsonrpsee` message sent by the server if the subscription was closed on the server side.
Some(Err(RpcError::SubscriptionClosed(reason))) => {
log::warn!(target: LOG_TARGET, "subscription to `subscribeNewHeads/subscribeFinalizedHeads` terminated: {:?}. Retrying..", reason);
subscription = heads_subscription().await?;
continue;
}
Some(Err(e)) => {
log::error!(target: LOG_TARGET, "subscription failed to decode Header {:?}, this is bug please file an issue", e);
return Err(e.into());
@@ -312,15 +306,6 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! {
while let Some(rp) = tx_subscription.next().await {
let status_update = match rp {
Ok(r) => r,
// Custom `jsonrpsee` message sent by the server if the subscription was closed on the server side.
Err(RpcError::SubscriptionClosed(reason)) => {
log::warn!(
target: LOG_TARGET,
"tx subscription closed by the server: {:?}; skip block: {}",
reason, at.number
);
return;
},
Err(e) => {
log::error!(target: LOG_TARGET, "subscription failed to decode TransactionStatus {:?}, this is a bug please file an issue", e);
let _ = tx.send(e.into());
polkadot/utils/staking-miner/src/rpc.rs
+3 -3
View File
@@ -77,7 +77,7 @@ pub trait RpcApi {
unsubscribe = "author_unwatchExtrinsic",
item = TransactionStatus<Hash, Hash>
)]
fn watch_extrinsic(&self, bytes: &Bytes) -> RpcResult<()>;
fn watch_extrinsic(&self, bytes: &Bytes);
/// New head subscription.
#[subscription(
@@ -85,7 +85,7 @@ pub trait RpcApi {
unsubscribe = "chain_unsubscribeNewHeads",
item = Header
)]
fn subscribe_new_heads(&self) -> RpcResult<()>;
fn subscribe_new_heads(&self);
/// Finalized head subscription.
#[subscription(
@@ -93,7 +93,7 @@ pub trait RpcApi {
unsubscribe = "chain_unsubscribeFinalizedHeads",
item = Header
)]
fn subscribe_finalized_heads(&self) -> RpcResult<()>;
fn subscribe_finalized_heads(&self);
}
/// Wraps a shared web-socket JSON-RPC client that can be cloned.