From b160d9340ff4f04fbf2c91f00866a3e3b739f7f1 Mon Sep 17 00:00:00 2001
From: Marcos <marcos@iovlabs.org>
Date: Tue, 19 Dec 2023 21:17:32 -0300
Subject: [PATCH] Add missing function to btc-utils

---
 lib/btc-utils.js                 |  1 +
 lib/liquidity-bridge-contract.js | 10 +++++-----
 lib/rsk-utils.js                 |  3 +--
 lib/sol-utils.js                 |  4 ++--
 lib/utils.js                     |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/btc-utils.js b/lib/btc-utils.js
index ce465a10..661a8a53 100644
--- a/lib/btc-utils.js
+++ b/lib/btc-utils.js
@@ -1,6 +1,7 @@
 const bitcoinJs = require('bitcoinjs-lib');
 const merkleLib = require('merkle-lib');
 const pmtBuilder = require('@rsksmart/pmt-builder');
+const { retryWithCheck }} = require('./utils');
 
 const publicKeyToCompressed = (publicKey) => {
     return bitcoinJs.ECPair.fromPublicKey(Buffer.from(publicKey, 'hex'), { compressed: true })
diff --git a/lib/liquidity-bridge-contract.js b/lib/liquidity-bridge-contract.js
index 2ce9f992..f119fb52 100644
--- a/lib/liquidity-bridge-contract.js
+++ b/lib/liquidity-bridge-contract.js
@@ -1,9 +1,9 @@
 const fs = require('fs');
 const { getRskTransactionHelper } = require('../lib/rsk-tx-helper-provider');
 
-const solUtils = require('../lib/sol-utils');
-const rskUtils = require('../lib/rsk-utils');
-const btcEthUnitConverter = require('@rsksmart/btc-eth-unit-converter');
+const { compileAndDeploy } = require('./sol-utils');
+const { sendFromCow } = require('.rsk-utils');
+const { btcToWeis } = require('@rsksmart/btc-eth-unit-converter');
 
 const INITIAL_RSK_BALANCE_IN_BTC = 1;
 const BRIDGE_ADDRESS = '0x0000000000000000000000000000000001000006';
@@ -16,12 +16,12 @@ let contractInstance;
 const deployLiquidityBridgeContract = async (host = null) => {
     const rskTransactionHelper = getRskTransactionHelper(host);
     const fromAddress = await rskTransactionHelper.newAccountWithSeed('');
-    await rskUtils.sendFromCow(rskTransactionHelper, fromAddress, Number(btcEthUnitConverter.btcToWeis(INITIAL_RSK_BALANCE_IN_BTC)));
+    await sendFromCow(rskTransactionHelper, fromAddress, Number(btcToWeis(INITIAL_RSK_BALANCE_IN_BTC)));
     await rskTransactionHelper.unlockAccount(fromAddress, '');
     
     try {
         const source = fs.readFileSync(LIQUIDITY_BRIDGE_CONTRACT_FILE).toString();
-        const liquidityBridgeContract = await solUtils.compileAndDeploy(
+        const liquidityBridgeContract = await compileAndDeploy(
             SOLIDITY_COMPILER_VERSION,
             source,
             LIQUIDITY_BRIDGE_CONTRACT_NAME,
diff --git a/lib/rsk-utils.js b/lib/rsk-utils.js
index 1dbe4d67..1df0be23 100644
--- a/lib/rsk-utils.js
+++ b/lib/rsk-utils.js
@@ -1,11 +1,10 @@
-const { wait, retryWithCheck } = require('./utils');
 const expect = require('chai').expect;
 const { getBridgeState } = require('@rsksmart/bridge-state-data-parser');
 const { getBridge, getLatestActiveForkName } = require('./precompiled-abi-forks-util');
 const hopBridgeTxParser = require('bridge-transaction-parser-hop400');
 const fingerrootBridgeTxParser = require('bridge-transaction-parser-fingerroot500');
 const { getRskTransactionHelpers } = require('../lib/rsk-tx-helper-provider');
-const { removePrefix0x } = require('./utils');
+const { wait, retryWithCheck, removePrefix0x } = require('./utils');
 const { waitForBitcoinMempoolToGetTxs } = require('./btc-utils');
 
 const BTC_TO_RSK_MINIMUM_ACCEPTABLE_CONFIRMATIONS = 3;
diff --git a/lib/sol-utils.js b/lib/sol-utils.js
index 25d0a461..06a42093 100644
--- a/lib/sol-utils.js
+++ b/lib/sol-utils.js
@@ -1,6 +1,6 @@
 let solc = require('solc');
 const { wait } = require('./utils');
-const rskUtils = require('../lib/rsk-utils');
+const { mineAndSync } = require('./rsk-utils');
 const { getRskTransactionHelpers } = require('../lib/rsk-tx-helper-provider');
 
 const promisefy = function(f, args) {
@@ -24,7 +24,7 @@ const compileAndDeploy = async(compilerVersion, source, name, constructorArgumen
   // Default options
   options = Object.assign({
     mine: async () => {
-      return await rskUtils.mineAndSync(getRskTransactionHelpers());
+      return await mineAndSync(getRskTransactionHelpers());
     },
     gas: 'estimate',
   }, options);
diff --git a/lib/utils.js b/lib/utils.js
index f0992aed..3f1bb13f 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -148,10 +148,10 @@ module.exports = {
   removePrefix0x,
   removeDir,
   executeWithRetries,
+  retryWithCheck,
   additionalFederationAddresses: {
     get: getAdditionalFederationAddresses,
     add: addAdditionalFederationAddress,
     remove: removeAdditionalFederationAddress
-  },
-  retryWithCheck
+  }
 }