uqbar-dao/nectar
1
1
Fork 0
mirror of https://github.com/uqbar-dao/nectar.git synced 2024-12-23 16:43:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

eth: remove dead code; add error print

Browse Source
This commit is contained in:
hosted-fornet 2024-08-22 11:21:44 -07:00
parent 02c2dfe715
commit 290ae3d461
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kinode/src/eth/subscription.rs
View File

@ -257,8 +257,6 @@ async fn build_subscription(
)
.await;
}
let alloy_sub_id = rx.local_id();
let alloy_sub_id: alloy::primitives::U256 = alloy_sub_id.clone().into();
return Ok(Ok((rx, chain_id)));
}
Err(rpc_error) => {
@ -389,7 +387,7 @@ async fn maintain_local_subscription(
loop {
tokio::select! {
_ = close_receiver.recv() => {
unsubscribe(rx, &chain_id, providers);
unsubscribe(rx, &chain_id, providers).await;
return Ok(());
},
value = rx.recv() => {
@ -424,14 +422,14 @@ async fn maintain_local_subscription(
.and_modify(|sub_map| {
sub_map.remove(&sub_id);
});
unsubscribe(rx, &chain_id, providers);
unsubscribe(rx, &chain_id, providers).await;
Err(EthSubError {
id: sub_id,
error: format!("subscription ({target}) closed unexpectedly"),
})
}
fn unsubscribe(rx: RawSubscription, chain_id: &u64, providers: &Providers) {
async fn unsubscribe(rx: RawSubscription, chain_id: &u64, providers: &Providers) {
let alloy_sub_id = rx.local_id();
let alloy_sub_id = alloy_sub_id.clone().into();
let Some(chain_providers) = providers.get_mut(chain_id) else {
@ -441,7 +439,14 @@ fn unsubscribe(rx: RawSubscription, chain_id: &u64, providers: &Providers) {
let Some(pubsub) = url.pubsub.as_ref() else {
continue;
};
let x = pubsub.unsubscribe(alloy_sub_id);
if let Err(err) = pubsub.unsubscribe(alloy_sub_id) {
let _ = print_tx
.send(Printout {
verbosity: 0,
content: "unsubscribe from ETH RPC failed".to_string(),
})
.await;
}
}
}