tornadocontrib/ web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get instead of remove

This commit is contained in:
Bryan Stitt 2023-02-24 23:31:10 -08:00
parent 9ec3ebeff7
commit 580965ef83
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web3_proxy/src/block_number.rs
View File

@ -70,7 +70,7 @@ pub async fn clean_block_number(
// convert the json value to a BlockNumber // convert the json value to a BlockNumber
let (block_num, change) = if let Some(obj) = x.as_object_mut() { let (block_num, change) = if let Some(obj) = x.as_object_mut() {
// it might be a Map like `{"blockHash": String("0xa5626dc20d3a0a209b1de85521717a3e859698de8ce98bca1b16822b7501f74b")}` // it might be a Map like `{"blockHash": String("0xa5626dc20d3a0a209b1de85521717a3e859698de8ce98bca1b16822b7501f74b")}`
if let Some(block_hash) = obj.remove("blockHash") { if let Some(block_hash) = obj.get("blockHash").cloned() {
let block_hash: H256 = let block_hash: H256 =
serde_json::from_value(block_hash).context("decoding blockHash")?; serde_json::from_value(block_hash).context("decoding blockHash")?;
@ -79,7 +79,7 @@ pub async fn clean_block_number(
.await .await
.context("fetching block number from hash")?; .context("fetching block number from hash")?;
// TODO: set change to true? i think not we should probably use hashes for everything. // TODO: we do not change the
(*block.number(), false) (*block.number(), false)
} else { } else {
return Err(anyhow::anyhow!("blockHash missing")); return Err(anyhow::anyhow!("blockHash missing"));
@ -176,6 +176,7 @@ pub async fn block_needed(
"eth_getLogs" => { "eth_getLogs" => {
// TODO: think about this more // TODO: think about this more
// TODO: jsonrpc has a specific code for this // TODO: jsonrpc has a specific code for this
// TODO: this shouldn't be a 500. this should
let obj = params[0] let obj = params[0]
.as_object_mut() .as_object_mut()
.ok_or_else(|| anyhow::anyhow!("invalid format"))?; .ok_or_else(|| anyhow::anyhow!("invalid format"))?;

2
web3_proxy/src/rpcs/many.rs
View File

@ -887,7 +887,7 @@ impl Web3Rpcs {
continue; continue;
} }
// others look like this // others look like this (this is the example in the official spec)
if error_msg == "Method not found" { if error_msg == "Method not found" {
method_not_available_response = Some(response); method_not_available_response = Some(response);
continue; continue;