From bb6f0d5b36a3918842125daf2d6925613f7bcbcf Mon Sep 17 00:00:00 2001 From: Prasanna Loganathar Date: Mon, 11 Nov 2024 23:38:37 +0800 Subject: [PATCH 1/2] Fix lints --- src/dfi/rpc_accounts.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/dfi/rpc_accounts.cpp b/src/dfi/rpc_accounts.cpp index e5fea69d01..b28a759085 100644 --- a/src/dfi/rpc_accounts.cpp +++ b/src/dfi/rpc_accounts.cpp @@ -3703,13 +3703,12 @@ UniValue logdbhashes(const JSONRPCRequest &request) { const auto height = ::ChainActive().Height(); const auto blockHash = ::ChainActive().Tip()->GetBlockHash().ToString(); - // Prepare result UniValue result(UniValue::VOBJ); result.pushKV("height", height); result.pushKV("blockhash", blockHash); // Note that this only guaranteed to be equal with other nodes - // if they didn't hit undo changes at different points. + // if they didn't hit undo changes at different points. // Other known instance that can cause this to differ: // - consolidaterewards at different points if pre-static addresses are involved. result.pushKV("dvmhash", hashHex); @@ -3718,7 +3717,7 @@ UniValue logdbhashes(const JSONRPCRequest &request) { auto res = XResultValueLogged(evm_try_get_latest_block_hash(result)); if (res) { // Only available after EVM activation - // EVM block hash already is inclusive of all it's + // EVM block hash already is inclusive of all it's // state, so we don't need to do the DVM shenangins. auto evmBlockHash = uint256::FromByteArray(*res).GetHex(); result.pushKV("evmhash", evmBlockHash); @@ -3726,7 +3725,7 @@ UniValue logdbhashes(const JSONRPCRequest &request) { const auto evmDbNodeHashHex = XResultValueLogged(evm_try_get_hash_db_state(result)); if (evmDbNodeHashHex) { - // Note: This can vary from node to node unlike the rest. + // Note: This can vary from node to node unlike the rest. result.pushKV("varhash_evmalldb", std::string(*evmDbNodeHashHex)); } From 5d8bdae5df2b7a16aa8311d64852d14ea169e255 Mon Sep 17 00:00:00 2001 From: jouzo <15011228+Jouzo@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:10:53 +0000 Subject: [PATCH 2/2] Fix clippy --- lib/ain-ocean/src/api/oracle.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/ain-ocean/src/api/oracle.rs b/lib/ain-ocean/src/api/oracle.rs index d1b309f63c..f1f42dd06c 100644 --- a/lib/ain-ocean/src/api/oracle.rs +++ b/lib/ain-ocean/src/api/oracle.rs @@ -103,7 +103,6 @@ async fn get_feed( .list(None, SortOrder::Descending)? .paginate(&query) .flatten() - .into_iter() .filter(|((token, currency, oracle_id, _), _)| { key.0.eq(token) && key.1.eq(currency) && key.2.eq(oracle_id) })