From 60ab14f0a45f5bcaaeb5d3c0e2b52aa3b639898e Mon Sep 17 00:00:00 2001 From: Bushstar Date: Tue, 15 Oct 2024 13:23:23 +0100 Subject: [PATCH] lint: circular deps --- test/lint/lint-circular-dependencies.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh index af98a3ecbd..be5934650d 100755 --- a/test/lint/lint-circular-dependencies.sh +++ b/test/lint/lint-circular-dependencies.sh @@ -9,6 +9,9 @@ export LC_ALL=C EXPECTED_CIRCULAR_DEPENDENCIES=( + "addrdb -> chainparams -> dfi/mn_checks -> ffi/ffiocean -> ffi/ffiexports -> net -> banman -> addrdb" + "addrdb -> chainparams -> dfi/mn_checks -> ffi/ffiocean -> ffi/ffiexports -> net -> addrdb" + "blockencodings -> chainparams -> dfi/mn_checks -> ffi/ffiocean -> ffi/ffiexports -> httprpc -> rpc/server -> rpc/util -> node/transaction -> net_processing -> blockencodings" "chain -> chainparams -> dfi/mn_checks -> index/txindex -> chain" "chain -> chainparams -> dfi/mn_checks -> index/txindex -> txdb -> chain" "chain -> chainparams -> dfi/mn_checks -> dfi/vaulthistory -> chain" @@ -16,9 +19,13 @@ EXPECTED_CIRCULAR_DEPENDENCIES=( "chain -> chainparams -> dfi/mn_checks -> validation -> versionbits -> chain" "chain -> chainparams -> dfi/mn_checks -> validation -> wallet/wallet -> chain" "chainparams -> key_io -> chainparams" - "chainparams -> dfi/mn_checks -> index/txindex -> index/base -> chainparams" "chainparams -> dfi/mn_checks -> dfi/customtx -> chainparams" "chainparams -> dfi/mn_checks -> dfi/vaulthistory -> dfi/vault -> chainparams" + "chainparams -> dfi/mn_checks -> ffi/ffiocean -> ffi/ffiexports -> chainparams" + "chainparams -> dfi/mn_checks -> ffi/ffiocean -> ffi/ffiexports -> httprpc -> chainparams" + "chainparams -> dfi/mn_checks -> ffi/ffiocean -> ffi/ffiexports -> httprpc -> rpc/server -> rpc/util -> node/transaction -> net_processing -> chainparams" + "chainparams -> dfi/mn_checks -> ffi/ffiocean -> ffi/ffiexports -> net -> chainparams" + "chainparams -> dfi/mn_checks -> index/txindex -> index/base -> chainparams" "chainparams -> dfi/mn_checks -> txmempool -> chainparams" "chainparams -> dfi/mn_checks -> validation -> chainparams" "chainparams -> dfi/mn_checks -> validation -> spv/spv_wrapper -> chainparams" @@ -31,6 +38,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=( "dfi/accountshistory -> dfi/historywriter -> dfi/mn_checks -> dfi/accountshistory" "dfi/accountshistory -> dfi/masternodes -> dfi/accountshistory" "dfi/accountshistory -> dfi/masternodes -> validation -> dfi/accountshistory" + "dfi/accountshistory -> dfi/masternodes -> validation -> ffi/ffiexports -> dfi/accountshistory" "dfi/accountshistory -> flushablestorage -> dfi/snapshotmanager -> dfi/accountshistory" "dfi/anchors -> dfi/masternodes -> dfi/anchors" "dfi/anchors -> dfi/masternodes -> net_processing -> dfi/anchors" @@ -82,13 +90,14 @@ 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 -> validation -> ffi/ffiexports -> dfi/mn_rpc" + "dfi/mn_rpc -> wallet/rpcwallet -> init -> miner -> dfi/validation -> 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" - "dfi/mn_rpc -> wallet/rpcwallet -> init -> miner -> dfi/validation -> dfi/mn_rpc" "dfi/snapshotmanager -> dfi/vaulthistory -> flushablestorage -> dfi/snapshotmanager" "dfi/validation -> validation -> dfi/validation" "dfi/validation -> ffi/ffiexports -> dfi/validation" + "ffi/ffiexports -> httprpc -> rpc/server -> rpc/util -> node/transaction -> validation -> ffi/ffiexports" "logging -> util/system -> logging" "logging -> util/system -> sync -> logging" "miner -> wallet/wallet -> policy/fees -> miner" @@ -115,7 +124,6 @@ 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