From 575e4dfbb0dd6b2e247889204e905df5fc542ff1 Mon Sep 17 00:00:00 2001 From: jouzo <15011228+Jouzo@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:47:59 +0100 Subject: [PATCH] Fix lint --- src/validation.cpp | 3 +-- test/lint/lint-circular-dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index b3560e7453..950158795d 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -3773,7 +3772,7 @@ bool CChainState::DisconnectTip(CValidationState &state, XResultThrowOnErr(evm_try_disconnect_latest_block(result)); } - if (gArgs.GetBoolArg("-oceanarchive", DEFAULT_OCEAN_INDEXER_ENABLED)) { + if (gArgs.GetBoolArg("-oceanarchive", false)) { const UniValue b = blockToJSON(mnview, block, pindexDelete, pindexDelete, true, 2); XResultThrowOnErr(ocean_invalidate_block(result, b.write())); } diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh index 387320503e..af98a3ecbd 100755 --- a/test/lint/lint-circular-dependencies.sh +++ b/test/lint/lint-circular-dependencies.sh @@ -82,7 +82,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=( "dfi/mn_checks -> txmempool -> dfi/mn_checks" "dfi/mn_checks -> validation -> dfi/mn_checks" "dfi/mn_checks -> validation -> wallet/wallet -> dfi/mn_checks" - "dfi/mn_rpc -> wallet/rpcwallet -> init -> ffi/ffiexports -> dfi/mn_rpc" "dfi/govvariables/attributes -> dfi/mn_rpc -> wallet/rpcwallet -> init -> miner -> dfi/govvariables/attributes" # "dfi/govvariables/attributes -> dfi/mn_rpc -> wallet/rpcwallet -> init -> rpc/blockchain -> dfi/govvariables/attributes" "dfi/govvariables/attributes -> dfi/validation -> rpc/blockchain -> dfi/govvariables/attributes" @@ -116,6 +115,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=( "wallet/fees -> wallet/wallet -> wallet/fees" "wallet/ismine -> wallet/wallet -> wallet/ismine" "wallet/wallet -> wallet/walletdb -> wallet/wallet" + "dfi/mn_rpc -> wallet/rpcwallet -> init -> ffi/ffiexports -> dfi/mn_rpc" ) EXIT_CODE=0