Fix tests

rsksmart · Aug 8, 2024 · 2a832e7 · 2a832e7
1 parent 6756790
commit 2a832e7
Show file tree

Hide file tree

Showing 3 changed files with 184 additions and 103 deletions.
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportFlyoverTest.java
@@ -25,9 +25,7 @@
 import co.rsk.bitcoinj.wallet.Wallet;
 import co.rsk.peg.bitcoin.BitcoinTestUtils;
 import co.rsk.peg.btcLockSender.BtcLockSender;
-import co.rsk.peg.constants.BridgeConstants;
-import co.rsk.peg.constants.BridgeMainNetConstants;
-import co.rsk.peg.constants.BridgeRegTestConstants;
+import co.rsk.peg.constants.*;
 import co.rsk.core.RskAddress;
 import co.rsk.crypto.Keccak256;
 import co.rsk.peg.bitcoin.CoinbaseInformation;
@@ -3134,6 +3132,7 @@ void registerFlyoverBtcTransaction_surpasses_locking_cap_and_shouldTransfer_is_f
             btcContext,
             feePerKbSupport,
             whitelistSupport,
+            mock(FederationSupport.class),
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache
@@ -3336,9 +3335,9 @@ void registerFlyoverBtcTransaction_OK()
             repository,
             mock(Block.class),
             btcContext,
-            federationSupport,
             feePerKbSupport,
             whitelistSupport,
+            federationSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache
@@ -3447,9 +3446,9 @@ void createFlyoverFederationInformation_OK() {
             mock(Repository.class),
             mock(Block.class),
             mock(Context.class),
-            federationSupport,
             feePerKbSupport,
             whitelistSupport,
+            federationSupport,
             mock(BtcBlockStoreWithCache.Factory.class),
             activations,
             signatureCache

diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java
@@ -42,20 +42,17 @@
 import co.rsk.peg.btcLockSender.BtcLockSenderProvider;
 import co.rsk.peg.constants.*;
 import co.rsk.peg.federation.*;
+import co.rsk.peg.federation.FederationMember.KeyType;
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.feeperkb.FeePerKbSupport;
 import co.rsk.peg.pegininstructions.PeginInstructionsProvider;
 import co.rsk.peg.simples.SimpleBlockChain;
-import co.rsk.peg.storage.BridgeStorageAccessorImpl;
-import co.rsk.peg.storage.InMemoryStorage;
-import co.rsk.peg.storage.StorageAccessor;
+import co.rsk.peg.storage.*;
 import co.rsk.peg.utils.BridgeEventLogger;
 import co.rsk.peg.vote.*;
 import co.rsk.peg.whitelist.*;
 import co.rsk.peg.whitelist.constants.WhitelistMainNetConstants;
-import co.rsk.test.builders.BlockChainBuilder;
-import co.rsk.test.builders.BridgeSupportBuilder;
-import co.rsk.test.builders.FederationSupportBuilder;
+import co.rsk.test.builders.*;
 import co.rsk.trie.Trie;
 import com.google.common.collect.Lists;
 import java.io.*;