github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-30 01:28:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: check if value is bool (#3708)

Browse Source
This commit is contained in:
Matthias Seitz
2023-07-11 02:55:09 +02:00
committed by GitHub
parent 2bc5e19edb
commit 467f6f9199
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/rpc/rpc-types/src/eth/pubsub.rs
View File

@@ -104,8 +104,8 @@ pub enum Params {
None,
/// Log parameters.
Logs(Box<Filter>),
/// New pending transaction parameters.
NewPendingTransactions(bool),
/// Boolean parameter for new pending transactions.
Bool(bool),
}
impl Serialize for Params {
@@ -116,7 +116,7 @@ impl Serialize for Params {
match self {
Params::None => (&[] as &[serde_json::Value]).serialize(serializer),
Params::Logs(logs) => logs.serialize(serializer),
Params::NewPendingTransactions(full) => full.serialize(serializer),
Params::Bool(full) => full.serialize(serializer),
}
}
}
@@ -132,6 +132,10 @@ impl<'a> Deserialize<'a> for Params {
return Ok(Params::None)
}
if let Some(val) = v.as_bool() {
return Ok(Params::Bool(val))
}
serde_json::from_value(v)
.map(|f| Params::Logs(Box::new(f)))
.map_err(|e| D::Error::custom(format!("Invalid Pub-Sub parameters: {e}")))

4
crates/rpc/rpc/src/eth/pubsub.rs
View File

@@ -124,7 +124,7 @@ where
SubscriptionKind::NewPendingTransactions => {
if let Some(params) = params {
match params {
Params::NewPendingTransactions(true) => {
Params::Bool(true) => {
// full transaction objects requested
let stream = pubsub.full_pending_transaction_stream().map(|tx| {
EthSubscriptionResult::FullTransaction(Box::new(
@@ -135,7 +135,7 @@ where
});
return pipe_from_stream(accepted_sink, stream).await
}
Params::NewPendingTransactions(false) | Params::None => {
Params::Bool(false) | Params::None => {
// only hashes requested
}
Params::Logs(_) => {