refactor: drop circular dependency

dashpay · Aug 26, 2024 · b330318 · b330318
1 parent e54fe42
commit b330318
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/evo/assetlocktx.h b/src/evo/assetlocktx.h
@@ -9,7 +9,6 @@
 #include <primitives/transaction.h>
 #include <gsl/pointers.h>
 
-#include <core_io.h>
 #include <serialize.h>
 #include <univalue.h>
 
@@ -23,6 +22,10 @@ namespace llmq {
 class CQuorumManager;
 } // namespace llmq
 
+// Forward declaration from core_io to get rid of circular dependency
+UniValue ValueFromAmount(const CAmount amount);
+void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex, bool include_addresses);
+
 class CAssetLockPayload
 {
 public:

diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh
@@ -102,7 +102,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
     "llmq/chainlocks -> net_processing -> llmq/context -> llmq/chainlocks"
     "coinjoin/client -> coinjoin/coinjoin -> llmq/chainlocks -> net_processing -> coinjoin/client"
     "rpc/blockchain -> rpc/server -> rpc/blockchain"
-    "core_io -> evo/assetlocktx -> core_io"
 )
 
 EXIT_CODE=0