From 0d6dd00b09f70099a9c029ae843cf11ec277ae60 Mon Sep 17 00:00:00 2001
From: Marcos <marcos@iovlabs.org>
Date: Tue, 20 Aug 2024 12:52:12 -0300
Subject: [PATCH] Remove unthrown exceptions from method signatures

Remove unused import
---
 .../src/main/java/co/rsk/peg/Bridge.java      |  10 +-
 .../co/rsk/peg/BridgeStorageProvider.java     |   8 +-
 .../main/java/co/rsk/peg/BridgeSupport.java   |  46 ++--
 .../rsk/peg/federation/FederationSupport.java |   7 +-
 .../org/ethereum/config/SystemProperties.java |   1 -
 .../co/rsk/peg/BridgeStorageProviderTest.java | 152 +++++++------
 .../test/java/co/rsk/peg/BridgeSupportIT.java | 212 +++++++++++-------
 .../java/co/rsk/peg/BridgeSupportTest.java    |   2 +-
 ...ockCoinbaseTransactionInformationTest.java |  48 ++--
 9 files changed, 271 insertions(+), 215 deletions(-)

diff --git a/rskj-core/src/main/java/co/rsk/peg/Bridge.java b/rskj-core/src/main/java/co/rsk/peg/Bridge.java
index fd6c3382897..7f8d422e6bb 100644
--- a/rskj-core/src/main/java/co/rsk/peg/Bridge.java
+++ b/rskj-core/src/main/java/co/rsk/peg/Bridge.java
@@ -903,7 +903,7 @@ public long getRetiringFederationCreationBlockNumber(Object[] args) {
         return bridgeSupport.getRetiringFederationCreationBlockNumber();
     }
 
-    public Integer createFederation(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer createFederation(Object[] args) {
         logger.trace("createFederation");
 
         return bridgeSupport.voteFederationChange(
@@ -912,7 +912,7 @@ public Integer createFederation(Object[] args) throws BridgeIllegalArgumentExcep
         );
     }
 
-    public Integer addFederatorPublicKey(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer addFederatorPublicKey(Object[] args) {
         logger.trace("addFederatorPublicKey");
 
         byte[] publicKeyBytes;
@@ -929,7 +929,7 @@ public Integer addFederatorPublicKey(Object[] args) throws BridgeIllegalArgument
         );
     }
 
-    public Integer addFederatorPublicKeyMultikey(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer addFederatorPublicKeyMultikey(Object[] args) {
         logger.trace("addFederatorPublicKeyMultikey");
 
         byte[] btcPublicKeyBytes = (byte[]) args[0];
@@ -945,7 +945,7 @@ public Integer addFederatorPublicKeyMultikey(Object[] args) throws BridgeIllegal
         );
     }
 
-    public Integer commitFederation(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer commitFederation(Object[] args) {
         logger.trace("commitFederation");
 
         byte[] hash;
@@ -962,7 +962,7 @@ public Integer commitFederation(Object[] args) throws BridgeIllegalArgumentExcep
         );
     }
 
-    public Integer rollbackFederation(Object[] args) throws BridgeIllegalArgumentException {
+    public Integer rollbackFederation(Object[] args) {
         logger.trace("rollbackFederation");
 
         return bridgeSupport.voteFederationChange(
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeStorageProvider.java b/rskj-core/src/main/java/co/rsk/peg/BridgeStorageProvider.java
index f7fe046e510..1b9797bd1c5 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeStorageProvider.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeStorageProvider.java
@@ -373,15 +373,15 @@ public Optional<FlyoverFederationInformation> getFlyoverFederationInformation(by
             return Optional.empty();
         }
 
-        FlyoverFederationInformation flyoverFederationInformation = this.safeGetFromRepository(
+        FlyoverFederationInformation flyoverFederationInformationInStorage = this.safeGetFromRepository(
             getStorageKeyForFlyoverFederationInformation(flyoverFederationRedeemScriptHash),
             data -> BridgeSerializationUtils.deserializeFlyoverFederationInformation(data, flyoverFederationRedeemScriptHash)
         );
-        if (flyoverFederationInformation == null) {
+        if (flyoverFederationInformationInStorage == null) {
             return Optional.empty();
         }
 
-        return Optional.of(flyoverFederationInformation);
+        return Optional.of(flyoverFederationInformationInStorage);
     }
 
     public void setFlyoverFederationInformation(FlyoverFederationInformation flyoverFederationInformation) {
@@ -520,7 +520,7 @@ protected void savePegoutTxSigHashes() {
         ));
     }
 
-    public void save() throws IOException {
+    public void save() {
         saveBtcTxHashesAlreadyProcessed();
 
         saveReleaseRequestQueue();
diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
index a5aef5b9a05..d83bf35927b 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
@@ -34,10 +34,7 @@
 import co.rsk.core.RskAddress;
 import co.rsk.crypto.Keccak256;
 import co.rsk.panic.PanicProcessor;
-import co.rsk.peg.bitcoin.BitcoinUtils;
-import co.rsk.peg.bitcoin.CoinbaseInformation;
-import co.rsk.peg.bitcoin.MerkleBranch;
-import co.rsk.peg.bitcoin.RskAllowUnconfirmedCoinSelector;
+import co.rsk.peg.bitcoin.*;
 import co.rsk.peg.btcLockSender.BtcLockSender.TxSenderAddressType;
 import co.rsk.peg.btcLockSender.BtcLockSenderProvider;
 import co.rsk.peg.federation.*;
@@ -72,9 +69,7 @@
 import org.ethereum.vm.DataWord;
 import org.ethereum.vm.PrecompiledContracts;
 import org.ethereum.vm.exception.VMException;
-import org.ethereum.vm.program.InternalTransaction;
-import org.ethereum.vm.program.Program;
-import org.ethereum.vm.program.ProgramResult;
+import org.ethereum.vm.program.*;
 import org.ethereum.vm.program.invoke.TransferInvoke;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -178,7 +173,7 @@ InputStream getCheckPoints() {
         return checkpoints;
     }
 
-    public void save() throws IOException {
+    public void save() {
         provider.save();
         feePerKbSupport.save();
         whitelistSupport.save();
@@ -280,7 +275,7 @@ private boolean cannotProcessNextBlock(StoredBlock previousBlock) {
      * @throws IOException
      * @param shouldConsiderFlyoverUTXOs
      */
-    public Wallet getActiveFederationWallet(boolean shouldConsiderFlyoverUTXOs) throws IOException {
+    public Wallet getActiveFederationWallet(boolean shouldConsiderFlyoverUTXOs) {
         Federation federation = getActiveFederation();
         List<UTXO> utxos = federationSupport.getActiveFederationBtcUTXOs();
 
@@ -298,15 +293,14 @@ public Wallet getActiveFederationWallet(boolean shouldConsiderFlyoverUTXOs) thro
      * or null if there's currently no retiring federation
      * @return A BTC wallet for the currently active federation
      *
-     * @throws IOException
      * @param shouldConsiderFlyoverUTXOs
      */
-    protected Wallet getRetiringFederationWallet(boolean shouldConsiderFlyoverUTXOs) throws IOException {
+    protected Wallet getRetiringFederationWallet(boolean shouldConsiderFlyoverUTXOs) {
         List<UTXO> retiringFederationBtcUTXOs = federationSupport.getRetiringFederationBtcUTXOs();
         return getRetiringFederationWallet(shouldConsiderFlyoverUTXOs, retiringFederationBtcUTXOs.size());
     }
 
-    private Wallet getRetiringFederationWallet(boolean shouldConsiderFlyoverUTXOs, int utxosSizeLimit) throws IOException {
+    private Wallet getRetiringFederationWallet(boolean shouldConsiderFlyoverUTXOs, int utxosSizeLimit) {
         Federation federation = getRetiringFederation();
         if (federation == null) {
             logger.debug("[getRetiringFederationWallet] No retiring federation found");
@@ -978,9 +972,11 @@ private void processFundsMigration(Transaction rskTx) throws IOException {
             long federationAge = rskExecutionBlock.getNumber() - activeFederation.getCreationBlockNumber();
             logger.trace("[processFundsMigration] Active federation (age={}) is in migration age.", federationAge);
             if (hasMinimumFundsToMigrate(retiringFederationWallet)){
+                Coin retiringFederationBalance = retiringFederationWallet.getBalance();
+                String retiringFederationBalanceInFriendlyFormat = retiringFederationBalance.toFriendlyString();
                 logger.info(
                     "[processFundsMigration] Retiring federation has funds to migrate: {}.",
-                    retiringFederationWallet.getBalance().toFriendlyString()
+                    retiringFederationBalanceInFriendlyFormat
                 );
 
                 migrateFunds(
@@ -994,9 +990,11 @@ private void processFundsMigration(Transaction rskTx) throws IOException {
 
         if (retiringFederationWallet != null && federationIsPastMigrationAge(activeFederation)) {
             if (retiringFederationWallet.getBalance().isGreaterThan(Coin.ZERO)) {
+                Coin retiringFederationBalance = retiringFederationWallet.getBalance();
+                String retiringFederationBalanceInFriendlyFormat = retiringFederationBalance.toFriendlyString();
                 logger.info(
                     "[processFundsMigration] Federation is past migration age and will try to migrate remaining balance: {}.",
-                    retiringFederationWallet.getBalance().toFriendlyString()
+                    retiringFederationBalanceInFriendlyFormat
                 );
 
                 try {
@@ -2031,7 +2029,7 @@ private List<Federation> getLiveFederations() {
         return liveFederations;
     }
 
-    public Integer voteFederationChange(Transaction tx, ABICallSpec callSpec) throws BridgeIllegalArgumentException {
+    public Integer voteFederationChange(Transaction tx, ABICallSpec callSpec) {
         return federationSupport.voteFederationChange(tx, callSpec, signatureCache, eventLogger);
     }
 
@@ -2533,7 +2531,7 @@ protected void saveFlyoverActiveFederationDataInStorage(
             Keccak256 derivationHash,
             FlyoverFederationInformation flyoverFederationInformation,
             List<UTXO> utxosList
-    ) throws IOException {
+    ) {
         provider.markFlyoverDerivationHashAsUsed(btcTxHash, derivationHash);
         provider.setFlyoverFederationInformation(flyoverFederationInformation);
         federationSupport.getActiveFederationBtcUTXOs().addAll(utxosList);
@@ -2544,7 +2542,7 @@ protected void saveFlyoverRetiringFederationDataInStorage(
         Keccak256 derivationHash,
         FlyoverFederationInformation flyoverRetiringFederationInformation,
         List<UTXO> utxosList
-    ) throws IOException {
+    ) {
         provider.markFlyoverDerivationHashAsUsed(btcTxHash, derivationHash);
         provider.setFlyoverRetiringFederationInformation(flyoverRetiringFederationInformation);
         federationSupport.getRetiringFederationBtcUTXOs().addAll(utxosList);
@@ -2597,14 +2595,12 @@ private Pair<BtcTransaction, List<UTXO>> createMigrationTransaction(Wallet origi
                 }
 
                 List<UTXO> selectedUTXOs = originWallet
-                        .getUTXOProvider().getOpenTransactionOutputs(originWallet.getWatchedAddresses()).stream()
-                        .filter(utxo ->
-                                migrationBtcTx.getInputs().stream().anyMatch(input ->
-                                        input.getOutpoint().getHash().equals(utxo.getHash()) &&
-                                                input.getOutpoint().getIndex() == utxo.getIndex()
-                                )
-                        )
-                        .collect(Collectors.toList());
+                    .getUTXOProvider()
+                    .getOpenTransactionOutputs(originWallet.getWatchedAddresses())
+                    .stream()
+                    .filter(utxo -> migrationBtcTx.getInputs().stream().anyMatch(input ->
+                        input.getOutpoint().getHash().equals(utxo.getHash()) && input.getOutpoint().getIndex() == utxo.getIndex()
+                    )).collect(Collectors.toList());
 
                 return Pair.of(migrationBtcTx, selectedUTXOs);
             } catch (InsufficientMoneyException | Wallet.ExceededMaxTransactionSize | Wallet.CouldNotAdjustDownwards e) {
diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java b/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java
index e0526a7b8bf..0f623dc6eb1 100644
--- a/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java
+++ b/rskj-core/src/main/java/co/rsk/peg/federation/FederationSupport.java
@@ -47,7 +47,12 @@ public interface FederationSupport {
     byte[] getPendingFederatorBtcPublicKey(int index);
     byte[] getPendingFederatorPublicKeyOfType(int index, FederationMember.KeyType keyType);
 
-    int voteFederationChange(Transaction tx, ABICallSpec callSpec, SignatureCache signatureCache, BridgeEventLogger eventLogger);
+    int voteFederationChange(
+        Transaction tx,
+        ABICallSpec callSpec,
+        SignatureCache signatureCache,
+        BridgeEventLogger eventLogger
+    );
     long getActiveFederationCreationBlockHeight();
     Optional<Script> getLastRetiredFederationP2SHScript();
 
diff --git a/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java b/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java
index 3d223d0e236..0f30adb8b27 100644
--- a/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java
+++ b/rskj-core/src/main/java/org/ethereum/config/SystemProperties.java
@@ -20,7 +20,6 @@
 package org.ethereum.config;
 
 import co.rsk.bitcoinj.core.BtcECKey;
-import co.rsk.peg.constants.BridgeDevNetConstants;
 import co.rsk.config.ConfigLoader;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigObject;
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java
index f56fd974547..553712e46b5 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java
@@ -102,8 +102,8 @@ void createInstance() throws IOException {
 
     @Test
     void createSaveAndRecreateInstanceWithProcessedHashes() throws IOException {
-        Sha256Hash hash1 = PegTestUtils.createHash();
-        Sha256Hash hash2 = PegTestUtils.createHash();
+        Sha256Hash hash1 = BitcoinTestUtils.createHash(1);
+        Sha256Hash hash2 = BitcoinTestUtils.createHash(2);
 
         Repository repository = createRepository();
         Repository track = repository.startTracking();
@@ -218,23 +218,30 @@ void getReleaseRequestQueue_after_rskip_146_activation() throws IOException {
 
         Repository repositoryMock = mock(Repository.class);
 
-        when(repositoryMock.getStorageBytes(any(),eq(RELEASE_REQUEST_QUEUE.getKey()))).
-            thenReturn(BridgeSerializationUtils.serializeReleaseRequestQueue(new ReleaseRequestQueue(new ArrayList<>(Arrays.asList(oldEntry)))));
+        when(repositoryMock.getStorageBytes(any(),eq(RELEASE_REQUEST_QUEUE.getKey()))).thenReturn(
+            BridgeSerializationUtils.serializeReleaseRequestQueue(new ReleaseRequestQueue(new ArrayList<>(Collections.singletonList(oldEntry))))
+        );
 
-        BridgeStorageProvider storageProvider = new BridgeStorageProvider(repositoryMock, mockAddress("aabbccdd"), testnetBtcParams,
-            activations);
+        BridgeStorageProvider storageProvider = new BridgeStorageProvider(
+            repositoryMock,
+            mockAddress("aabbccdd"),
+            testnetBtcParams,
+            activations
+        );
 
         ReleaseRequestQueue releaseRequestQueue = storageProvider.getReleaseRequestQueue();
 
-        releaseRequestQueue.add(Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
+        releaseRequestQueue.add(
+            Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
             Coin.COIN,
-            PegTestUtils.createHash3(0));
+            PegTestUtils.createHash3(0)
+        );
 
         ReleaseRequestQueue result = storageProvider.getReleaseRequestQueue();
 
-        Assertions.assertEquals(2, result.getEntries().size());
-        Assertions.assertEquals(result.getEntries().get(0), oldEntry);
-        Assertions.assertEquals(result.getEntries().get(1), newEntry);
+        assertEquals(2, result.getEntries().size());
+        assertEquals(result.getEntries().get(0), oldEntry);
+        assertEquals(result.getEntries().get(1), newEntry);
     }
 
     @Test
@@ -248,10 +255,9 @@ void saveReleaseRequestQueue_before_rskip_146_activation() throws IOException {
                 Coin.COIN)));
 
         ReleaseRequestQueue releaseRequestQueue = storageProvider.getReleaseRequestQueue();
-        releaseRequestQueue.add(Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mmWJhA74Pd6peL39V3AmtGHdGdJ4PyeXvL"),
-            Coin.COIN);
+        releaseRequestQueue.add(Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mmWJhA74Pd6peL39V3AmtGHdGdJ4PyeXvL"), Coin.COIN);
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             List<ReleaseRequestQueue.Entry> entries = BridgeSerializationUtils.deserializeReleaseRequestQueue(i.getArgument(2), testnetBtcParams);
             Assertions.assertEquals(oldEntriesList, entries);
             return true;
@@ -268,22 +274,21 @@ void saveReleaseRequestQueue_after_rskip_146_activation() throws IOException {
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP146)).thenReturn(true);
 
-        ReleaseRequestQueue.Entry newEntry =
-            new ReleaseRequestQueue.Entry(
-                Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
-                Coin.COIN,
-                PegTestUtils.createHash3(0)
-            );
+        ReleaseRequestQueue.Entry newEntry = new ReleaseRequestQueue.Entry(
+            Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
+            Coin.COIN,
+            PegTestUtils.createHash3(0)
+        );
 
-        ReleaseRequestQueue.Entry oldEntry =
-            new ReleaseRequestQueue.Entry(
-                Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
-                Coin.COIN
-            );
+        ReleaseRequestQueue.Entry oldEntry = new ReleaseRequestQueue.Entry(
+            Address.fromBase58((new BridgeRegTestConstants()).getBtcParams(), "mseEsMLuzaEdGbyAv9c9VRL9qGcb49qnxB"),
+            Coin.COIN
+        );
 
         Repository repositoryMock = mock(Repository.class);
-        when(repositoryMock.getStorageBytes(any(),eq(RELEASE_REQUEST_QUEUE.getKey()))).
-            thenReturn(BridgeSerializationUtils.serializeReleaseRequestQueue(new ReleaseRequestQueue(new ArrayList<>(Arrays.asList(oldEntry)))));
+        when(repositoryMock.getStorageBytes(any(),eq(RELEASE_REQUEST_QUEUE.getKey()))).thenReturn(
+            BridgeSerializationUtils.serializeReleaseRequestQueue(new ReleaseRequestQueue(new ArrayList<>(Collections.singletonList(oldEntry))))
+        );
 
         BridgeStorageProvider storageProvider = new BridgeStorageProvider(repositoryMock, mockAddress("aabbccdd"), testnetBtcParams, activations);
         ReleaseRequestQueue releaseRequestQueue = storageProvider.getReleaseRequestQueue();
@@ -293,15 +298,15 @@ void saveReleaseRequestQueue_after_rskip_146_activation() throws IOException {
             PegTestUtils.createHash3(0)
         );
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             List<ReleaseRequestQueue.Entry> entries = BridgeSerializationUtils.deserializeReleaseRequestQueue(i.getArgument(2), testnetBtcParams);
-            Assertions.assertEquals(entries, new ArrayList<>(Arrays.asList(oldEntry)));
+            Assertions.assertEquals(entries, new ArrayList<>(Collections.singletonList(oldEntry)));
             return true;
         }).when(repositoryMock).addStorageBytes(any(RskAddress.class), eq(RELEASE_REQUEST_QUEUE.getKey()), any(byte[].class));
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             List<ReleaseRequestQueue.Entry> entries = BridgeSerializationUtils.deserializeReleaseRequestQueue(i.getArgument(2), testnetBtcParams, true);
-            Assertions.assertEquals(entries, new ArrayList<>(Arrays.asList(newEntry)));
+            Assertions.assertEquals(entries, new ArrayList<>(Collections.singletonList(newEntry)));
             return true;
         }).when(repositoryMock).addStorageBytes(any(RskAddress.class), eq(RELEASE_REQUEST_QUEUE_WITH_TXHASH.getKey()), any(byte[].class));
 
@@ -348,18 +353,25 @@ void getPegoutsWaitingForConfirmations_after_rskip_146_activation() throws IOExc
         when(repositoryMock.getStorageBytes(any(RskAddress.class), eq(PEGOUTS_WAITING_FOR_CONFIRMATIONS.getKey())))
             .thenReturn(BridgeSerializationUtils.serializePegoutsWaitingForConfirmations(new PegoutsWaitingForConfirmations(oldEntriesSet)));
 
-        BridgeStorageProvider storageProvider = new BridgeStorageProvider(repositoryMock, mockAddress("aabbccdd"),
-            testnetBtcParams, activations);
+        BridgeStorageProvider storageProvider = new BridgeStorageProvider(
+            repositoryMock,
+            mockAddress("aabbccdd"),
+            testnetBtcParams,
+            activations
+        );
 
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = storageProvider.getPegoutsWaitingForConfirmations();
 
-        pegoutsWaitingForConfirmations.add(new SimpleBtcTransaction(testnetBtcParams, PegTestUtils.createHash(0)),
+        pegoutsWaitingForConfirmations.add(new SimpleBtcTransaction(
+            testnetBtcParams,
+            BitcoinTestUtils.createHash(0)),
             1L,
-            PegTestUtils.createHash3(0));
+            PegTestUtils.createHash3(0)
+        );
 
         PegoutsWaitingForConfirmations result = storageProvider.getPegoutsWaitingForConfirmations();
 
-        Assertions.assertEquals(2, result.getEntries().size());
+        assertEquals(2, result.getEntries().size());
     }
 
     @Test
@@ -374,7 +386,7 @@ void savePegoutsWaitingForConfirmations_before_rskip_146_activations() throws IO
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = storageProvider.getPegoutsWaitingForConfirmations();
         pegoutsWaitingForConfirmations.add(new BtcTransaction(testnetBtcParams), 1L);
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             Set<PegoutsWaitingForConfirmations.Entry> entries = BridgeSerializationUtils.deserializePegoutsWaitingForConfirmations(i.getArgument(2), testnetBtcParams).getEntries();
             Assertions.assertEquals(oldEntriesSet, entries);
             return true;
@@ -407,17 +419,20 @@ void savePegoutsWaitingForConfirmations_after_rskip_146_activations() throws IOE
         BridgeStorageProvider storageProvider = new BridgeStorageProvider(repositoryMock, mockAddress("aabbccdd"), testnetBtcParams, activations);
         PegoutsWaitingForConfirmations pegoutsWaitingForConfirmations = storageProvider.getPegoutsWaitingForConfirmations();
 
-        pegoutsWaitingForConfirmations.add(new SimpleBtcTransaction(testnetBtcParams, PegTestUtils.createHash(1)),
+        pegoutsWaitingForConfirmations.add(new SimpleBtcTransaction(
+            testnetBtcParams,
+            BitcoinTestUtils.createHash(1)),
             1L,
-            PegTestUtils.createHash3(0));
+            PegTestUtils.createHash3(0)
+        );
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             Set<PegoutsWaitingForConfirmations.Entry> entries = BridgeSerializationUtils.deserializePegoutsWaitingForConfirmations(i.getArgument(2), testnetBtcParams).getEntries();
             Assertions.assertEquals(entries, oldEntriesSet);
             return true;
         }).when(repositoryMock).addStorageBytes(any(RskAddress.class), eq(PEGOUTS_WAITING_FOR_CONFIRMATIONS.getKey()), any(byte[].class));
 
-        doAnswer((i) -> {
+        doAnswer(i -> {
             Set<PegoutsWaitingForConfirmations.Entry> entries = BridgeSerializationUtils.deserializePegoutsWaitingForConfirmations(i.getArgument(2), testnetBtcParams, true).getEntries();
             Assertions.assertEquals(entries, newEntriesSet);
             return true;
@@ -706,7 +721,7 @@ void setCoinBaseInformation_after_RSKIP143() {
     }
 
     @Test
-    void saveCoinBaseInformation_before_RSKIP143() throws IOException {
+    void saveCoinBaseInformation_before_RSKIP143() {
         Repository repository = mock(Repository.class);
 
         Sha256Hash hash = Sha256Hash.ZERO_HASH;
@@ -735,7 +750,7 @@ void saveCoinBaseInformation_before_RSKIP143() throws IOException {
     }
 
     @Test
-    void saveCoinBaseInformation_after_RSKIP143() throws IOException {
+    void saveCoinBaseInformation_after_RSKIP143() {
         Repository repository = mock(Repository.class);
 
         Sha256Hash hash = Sha256Hash.ZERO_HASH;
@@ -799,7 +814,7 @@ void getBtcBestBlockHashByHeight_afterRskip199_hashNotFound() {
 
     @Test
     void getBtcBestBlockHashByHeight_afterRskip199() {
-        Sha256Hash blockHash = PegTestUtils.createHash(2);
+        Sha256Hash blockHash = BitcoinTestUtils.createHash(2);
         byte[] serializedHash = BridgeSerializationUtils.serializeSha256Hash(blockHash);
 
         Repository repository = mock(Repository.class);
@@ -820,9 +835,9 @@ void getBtcBestBlockHashByHeight_afterRskip199() {
     }
 
     @Test
-    void saveBtcBlocksIndex_beforeRskip199() throws IOException {
+    void saveBtcBlocksIndex_beforeRskip199() {
         int blockHeight = 100;
-        Sha256Hash blockHash = PegTestUtils.createHash(2);
+        Sha256Hash blockHash = BitcoinTestUtils.createHash(2);
         byte[] serializedHash = BridgeSerializationUtils.serializeSha256Hash(blockHash);
 
         DataWord storageKey = DataWord.fromLongString("btcBlockHeight-" + blockHeight);
@@ -847,11 +862,11 @@ void saveBtcBlocksIndex_beforeRskip199() throws IOException {
     }
 
     @Test
-    void saveBtcBlocksIndex_afterRskip199() throws IOException {
+    void saveBtcBlocksIndex_afterRskip199() {
         int blockHeight = 100;
         DataWord storageKey = DataWord.fromLongString("btcBlockHeight-" + blockHeight);
 
-        Sha256Hash blockHash = PegTestUtils.createHash(2);
+        Sha256Hash blockHash = BitcoinTestUtils.createHash(2);
         byte[] serializedHash = BridgeSerializationUtils.serializeSha256Hash(blockHash);
 
         Repository repository = mock(Repository.class);
@@ -904,7 +919,7 @@ void isFlyoverFederationDerivationHashUsed_beforeRSKIP176_returnFalse() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(false);
@@ -925,7 +940,7 @@ void isFlyoverFederationDerivationHashUsed_storageReturnsNull_returnFalse() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         when(repository.getStorageBytes(
             bridgeAddress,
@@ -951,7 +966,7 @@ void isFlyoverFederationDerivationHashUsed_storageReturnsEmpty_returnFalse() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         when(repository.getStorageBytes(
             bridgeAddress,
@@ -977,7 +992,7 @@ void isFlyoverFederationDerivationHashUsed_storageReturnsWrongValue_returnFalse(
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         when(repository.getStorageBytes(
             bridgeAddress,
@@ -999,11 +1014,11 @@ void isFlyoverFederationDerivationHashUsed_storageReturnsWrongValue_returnFalse(
     }
 
     @Test
-    void saveDerivationArgumentsScriptHash_afterRSKIP176_ok() throws IOException {
+    void saveDerivationArgumentsScriptHash_afterRSKIP176_ok() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(true);
@@ -1028,7 +1043,7 @@ void saveDerivationArgumentsScriptHash_afterRSKIP176_ok() throws IOException {
     }
 
     @Test
-    void saveDerivationArgumentsScriptHash_afterRSKIP176_nullBtcTxHash_notSaved() throws IOException {
+    void saveDerivationArgumentsScriptHash_afterRSKIP176_nullBtcTxHash_notSaved() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
@@ -1050,11 +1065,10 @@ void saveDerivationArgumentsScriptHash_afterRSKIP176_nullBtcTxHash_notSaved() th
     }
 
     @Test
-    void saveDerivationArgumentsScriptHash_afterRSKIP176_nullDerivationHash_notSaved()
-        throws IOException {
+    void saveDerivationArgumentsScriptHash_afterRSKIP176_nullDerivationHash_notSaved() {
         Repository repository = mock(Repository.class);
 
-        Sha256Hash btcTxHash = PegTestUtils.createHash(1);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(1);
 
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(true);
@@ -1074,11 +1088,11 @@ void saveDerivationArgumentsScriptHash_afterRSKIP176_nullDerivationHash_notSaved
     }
 
     @Test
-    void saveDerivationArgumentsScriptHash_beforeRSKIP176_ok() throws IOException {
+    void saveDerivationArgumentsScriptHash_beforeRSKIP176_ok() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(1);
-        Sha256Hash btcTxHash = PegTestUtils.createHash(2);
+        Sha256Hash btcTxHash = BitcoinTestUtils.createHash(2);
 
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
         when(activations.isActive(ConsensusRule.RSKIP176)).thenReturn(false);
@@ -1231,7 +1245,7 @@ void getFlyoverFederationInformation_arrayEmpty_returnEmpty() {
     }
 
     @Test
-    void saveFlyoverFederationInformation_afterRSKIP176_ok() throws IOException {
+    void saveFlyoverFederationInformation_afterRSKIP176_ok() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(2);
@@ -1264,7 +1278,7 @@ void saveFlyoverFederationInformation_afterRSKIP176_ok() throws IOException {
     }
 
     @Test
-    void saveFlyoverFederationInformation_beforeRSKIP176_ok() throws IOException {
+    void saveFlyoverFederationInformation_beforeRSKIP176_ok() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(2);
@@ -1297,7 +1311,7 @@ void saveFlyoverFederationInformation_beforeRSKIP176_ok() throws IOException {
     }
 
     @Test
-    void saveFlyoverFederationInformation_alreadySet_dont_set_again() throws IOException {
+    void saveFlyoverFederationInformation_alreadySet_dont_set_again() {
         Repository repository = mock(Repository.class);
 
         Keccak256 derivationHash = PegTestUtils.createHash3(2);
@@ -1377,7 +1391,7 @@ void getReceiveHeadersLastTimestamp_not_in_repository() {
     }
 
     @Test
-    void saveReceiveHeadersLastTimestamp_before_RSKIP200() throws IOException {
+    void saveReceiveHeadersLastTimestamp_before_RSKIP200() {
         Repository repository = mock(Repository.class);
 
         BridgeStorageProvider provider = new BridgeStorageProvider(
@@ -1396,7 +1410,7 @@ void saveReceiveHeadersLastTimestamp_before_RSKIP200() throws IOException {
     }
 
     @Test
-    void saveReceiveHeadersLastTimestamp_after_RSKIP200() throws IOException {
+    void saveReceiveHeadersLastTimestamp_after_RSKIP200() {
         Repository repository = mock(Repository.class);
 
         BridgeStorageProvider provider = new BridgeStorageProvider(
@@ -1416,7 +1430,7 @@ void saveReceiveHeadersLastTimestamp_after_RSKIP200() throws IOException {
     }
 
     @Test
-    void saveReceiveHeadersLastTimestamp_not_set() throws IOException {
+    void saveReceiveHeadersLastTimestamp_not_set() {
         Repository repository = mock(Repository.class);
 
         BridgeStorageProvider provider = new BridgeStorageProvider(
@@ -1560,7 +1574,11 @@ void getReleaseRequestQueueSize_when_releaseRequestQueue_is_not_null() throws IO
 
     private BtcTransaction createTransaction() {
         BtcTransaction tx = new BtcTransaction(testnetBtcParams);
-        tx.addInput(PegTestUtils.createHash(), transactionOffset++, ScriptBuilder.createInputScript(new TransactionSignature(BigInteger.ONE, BigInteger.TEN)));
+        tx.addInput(
+            BitcoinTestUtils.createHash(1),
+            transactionOffset++,
+            ScriptBuilder.createInputScript(new TransactionSignature(BigInteger.ONE, BigInteger.TEN))
+        );
 
         return tx;
     }
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java
index 0a84bb1509f..edad6886ed9 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportIT.java
@@ -927,12 +927,23 @@ void callUpdateCollectionsChangeGetsOutOfDust() throws IOException {
     void callUpdateCollectionsWithTransactionsWaitingForConfirmationWithEnoughConfirmations() throws IOException {
         try (MockedStatic<BridgeUtils> bridgeUtilsMocked = mockStatic(BridgeUtils.class)) {
             // Fake wallet returned every time
-            bridgeUtilsMocked.when(() -> BridgeUtils.getFederationSpendWallet(any(Context.class), any(Federation.class), any(List.class), anyBoolean(), any())).thenReturn(mock(Wallet.class));
+            bridgeUtilsMocked.when(() -> BridgeUtils.getFederationSpendWallet(
+                any(Context.class),
+                any(Federation.class),
+                any(List.class),
+                anyBoolean(),
+                any()
+            )).thenReturn(mock(Wallet.class));
 
             Repository repository = createRepository();
             Repository track = repository.startTracking();
 
-            BridgeStorageProvider provider0 = new BridgeStorageProvider(track, PrecompiledContracts.BRIDGE_ADDR, bridgeConstants.getBtcParams(), activationsBeforeForks);
+            BridgeStorageProvider provider0 = new BridgeStorageProvider(
+                track,
+                PrecompiledContracts.BRIDGE_ADDR,
+                bridgeConstants.getBtcParams(),
+                activationsBeforeForks
+            );
 
             BtcTransaction txs = new BtcTransaction(btcParams);
             txs.addOutput(Coin.FIFTY_COINS, new BtcECKey());
@@ -2305,7 +2316,6 @@ void getRetiringFederationMethods_presentNewActive() {
         );
 
         Block mockedBlock = mock(Block.class);
-        Repository mockedRepository = mock(Repository.class);
 
         // New federation should be active in this block
         when(mockedBlock.getNumber()).thenReturn(25L);
@@ -2363,15 +2373,27 @@ void getPendingFederationMethods_present() {
         assertEquals(5, bridgeSupport.getPendingFederationSize().intValue());
         List<FederationMember> members = FederationTestUtils.getFederationMembers(5);
         for (int i = 0; i < 5; i++) {
-            assertTrue(Arrays.equals(members.get(i).getBtcPublicKey().getPubKey(), bridgeSupport.getPendingFederatorBtcPublicKey(i)));
-            assertTrue(Arrays.equals(members.get(i).getBtcPublicKey().getPubKey(), bridgeSupport.getPendingFederatorPublicKeyOfType(i, FederationMember.KeyType.BTC)));
-            assertTrue(Arrays.equals(members.get(i).getRskPublicKey().getPubKey(true), bridgeSupport.getPendingFederatorPublicKeyOfType(i, FederationMember.KeyType.RSK)));
-            assertTrue(Arrays.equals(members.get(i).getMstPublicKey().getPubKey(true), bridgeSupport.getPendingFederatorPublicKeyOfType(i, FederationMember.KeyType.MST)));
+            assertArrayEquals(
+                members.get(i).getBtcPublicKey().getPubKey(),
+                bridgeSupport.getPendingFederatorBtcPublicKey(i)
+            );
+            assertArrayEquals(
+                members.get(i).getBtcPublicKey().getPubKey(),
+                bridgeSupport.getPendingFederatorPublicKeyOfType(i, KeyType.BTC)
+            );
+            assertArrayEquals(
+                members.get(i).getRskPublicKey().getPubKey(true),
+                bridgeSupport.getPendingFederatorPublicKeyOfType(i, KeyType.RSK)
+            );
+            assertArrayEquals(
+                members.get(i).getMstPublicKey().getPubKey(true),
+                bridgeSupport.getPendingFederatorPublicKeyOfType(i, KeyType.MST)
+            );
         }
     }
 
     @Test
-    void voteFederationChange_methodNotAllowed() throws BridgeIllegalArgumentException {
+    void voteFederationChange_methodNotAllowed() {
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
             false,
             null,
@@ -2382,11 +2404,14 @@ void voteFederationChange_methodNotAllowed() throws BridgeIllegalArgumentExcepti
             null
         );
         ABICallSpec spec = new ABICallSpec("a-random-method", new byte[][]{});
-        assertEquals(FederationChangeResponseCode.GENERIC_ERROR.getCode(), bridgeSupport.voteFederationChange(mock(Transaction.class), spec));
+        assertEquals(
+            FederationChangeResponseCode.GENERIC_ERROR.getCode(),
+            bridgeSupport.voteFederationChange(mock(Transaction.class), spec)
+        );
     }
 
     @Test
-    void voteFederationChange_notAuthorized() throws BridgeIllegalArgumentException {
+    void voteFederationChange_notAuthorized() {
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
             false,
             null,
@@ -2399,7 +2424,10 @@ void voteFederationChange_notAuthorized() throws BridgeIllegalArgumentException
         ABICallSpec spec = new ABICallSpec("create", new byte[][]{});
         Transaction mockedTx = mock(Transaction.class);
         when(mockedTx.getSender(any(SignatureCache.class))).thenReturn(new RskAddress(ECKey.fromPrivate(BigInteger.valueOf(12L)).getAddress()));
-        assertEquals(FederationChangeResponseCode.GENERIC_ERROR.getCode(), bridgeSupport.voteFederationChange(mockedTx, spec));
+        assertEquals(
+            FederationChangeResponseCode.GENERIC_ERROR.getCode(),
+            bridgeSupport.voteFederationChange(mockedTx, spec)
+        );
     }
 
     private static class VotingMocksProvider {
@@ -2452,13 +2480,13 @@ public void setWinner(ABICallSpec winner) {
             this.winner = winner;
         }
 
-        public int execute(BridgeSupport bridgeSupport) throws BridgeIllegalArgumentException {
+        public int execute(BridgeSupport bridgeSupport) {
             return bridgeSupport.voteFederationChange(tx, spec);
         }
     }
 
     @Test
-    void createFederation_ok() throws BridgeIllegalArgumentException {
+    void createFederation_ok() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("create", new byte[][]{}, true);
 
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
@@ -2487,7 +2515,7 @@ void createFederation_ok() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void createFederation_pendingExists() throws BridgeIllegalArgumentException {
+    void createFederation_pendingExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("create", new byte[][]{}, false);
 
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
@@ -2509,7 +2537,7 @@ void createFederation_pendingExists() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void createFederation_withPendingActivation() throws BridgeIllegalArgumentException {
+    void createFederation_withPendingActivation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("create", new byte[][]{}, false);
         NetworkParameters btcParams = NetworkParameters.fromID(NetworkParameters.ID_REGTEST);
 
@@ -2561,7 +2589,7 @@ void createFederation_withPendingActivation() throws BridgeIllegalArgumentExcept
     }
 
     @Test
-    void createFederation_withExistingRetiringFederation() throws BridgeIllegalArgumentException {
+    void createFederation_withExistingRetiringFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("create", new byte[][]{}, false);
         NetworkParameters btcParams = NetworkParameters.fromID(NetworkParameters.ID_REGTEST);
 
@@ -2613,7 +2641,7 @@ void createFederation_withExistingRetiringFederation() throws BridgeIllegalArgum
     }
 
     @Test
-    void addFederatorPublicKey_okNoKeys() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_okNoKeys() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, true);
@@ -2661,14 +2689,14 @@ void addFederatorPublicKey_okNoKeys() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void addFederatorPublicKey_okKeys() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_okKeys() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")
         }, true);
 
-        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
+        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Collections.singletonList(
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
-        })));
+        )));
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
             false,
             null,
@@ -2705,7 +2733,7 @@ void addFederatorPublicKey_okKeys() throws BridgeIllegalArgumentException {
         assertArrayEquals(
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.MST)
-);
+        );
 
         assertArrayEquals(
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
@@ -2714,7 +2742,7 @@ void addFederatorPublicKey_okKeys() throws BridgeIllegalArgumentException {
         assertArrayEquals(
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
             bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.BTC)
-);
+        );
         assertArrayEquals(
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
             bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.RSK)
@@ -2729,7 +2757,7 @@ void addFederatorPublicKey_okKeys() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void addFederatorPublicKey_noPendingFederation() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_noPendingFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")
         }, false);
@@ -2753,14 +2781,14 @@ void addFederatorPublicKey_noPendingFederation() throws BridgeIllegalArgumentExc
     }
 
     @Test
-    void addFederatorPublicKey_keyExists() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_keyExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, false);
 
-        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
+        PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Collections.singletonList(
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
-        })));
+        )));
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
             false,
             null,
@@ -2780,7 +2808,7 @@ void addFederatorPublicKey_keyExists() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void addFederatorPublicKey_invalidKey() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_invalidKey() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add", new byte[][]{
             Hex.decode("aabbccdd")
         }, false);
@@ -2804,7 +2832,7 @@ void addFederatorPublicKey_invalidKey() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_okNoKeys() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_okNoKeys() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             Hex.decode("026289413837ab836eb76428406a3b4f200418d31d99c259a0532b8e435f35153b"),
@@ -2833,22 +2861,31 @@ void addFederatorPublicKeyMultikey_okNoKeys() throws BridgeIllegalArgumentExcept
         mocksProvider.setWinner(mocksProvider.getSpec());
         assertEquals(1, mocksProvider.execute(bridgeSupport));
         assertEquals(1, bridgeSupport.getPendingFederationSize().intValue());
-        assertTrue(Arrays.equals(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.BTC)));
-        assertTrue(Arrays.equals(Hex.decode("026289413837ab836eb76428406a3b4f200418d31d99c259a0532b8e435f35153b"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.RSK)));
-        assertTrue(Arrays.equals(Hex.decode("03e12efa1146037bc9325574b0f15749ba6dc0eec360b1670b05029eead511a6ff"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.MST)));
+        assertArrayEquals(
+            Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.BTC)
+        );
+        assertArrayEquals(
+            Hex.decode("026289413837ab836eb76428406a3b4f200418d31d99c259a0532b8e435f35153b"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.RSK)
+        );
+        assertArrayEquals(
+            Hex.decode("03e12efa1146037bc9325574b0f15749ba6dc0eec360b1670b05029eead511a6ff"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.MST)
+        );
         verify(mocksProvider.getElection(), times(1)).clearWinners();
         verify(mocksProvider.getElection(), never()).clear();
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_okKeys() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_okKeys() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
             Hex.decode("03f64d2c022bca70f3ff0b1e95336be2c1507daa2ad37a484e0b66cbda86cfc6c5"),
             Hex.decode("03eed62698319f754407a31fde9a51da8b2be0ab40e9c4c695bb057757729be37f")
         }, true);
 
-        PendingFederation pendingFederation = new PendingFederation(Arrays.asList(new FederationMember(
+        PendingFederation pendingFederation = new PendingFederation(Collections.singletonList(new FederationMember(
             BtcECKey.fromPublicOnly(Hex.decode("02ebd9e8b2caff48b10e661e69fe107d6986d2df1ce7e377f2ef927f3194a61b99")),
             ECKey.fromPublicOnly(Hex.decode("02a23343f50363dc9a4c29f0c0a8386780cc8bf469211f4de51d50f8c0f274e9a7")),
             ECKey.fromPublicOnly(Hex.decode("030dd584c286275ab2ce249096d0d7e6c78853e0902db061b14f2e39df068f95bc"))
@@ -2874,20 +2911,38 @@ void addFederatorPublicKeyMultikey_okKeys() throws BridgeIllegalArgumentExceptio
         mocksProvider.setWinner(mocksProvider.getSpec());
         assertEquals(1, mocksProvider.execute(bridgeSupport));
         assertEquals(2, bridgeSupport.getPendingFederationSize().intValue());
-        assertTrue(Arrays.equals(Hex.decode("02ebd9e8b2caff48b10e661e69fe107d6986d2df1ce7e377f2ef927f3194a61b99"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.BTC)));
-        assertTrue(Arrays.equals(Hex.decode("02a23343f50363dc9a4c29f0c0a8386780cc8bf469211f4de51d50f8c0f274e9a7"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.RSK)));
-        assertTrue(Arrays.equals(Hex.decode("030dd584c286275ab2ce249096d0d7e6c78853e0902db061b14f2e39df068f95bc"), bridgeSupport.getPendingFederatorPublicKeyOfType(0, FederationMember.KeyType.MST)));
+        assertArrayEquals(
+            Hex.decode("02ebd9e8b2caff48b10e661e69fe107d6986d2df1ce7e377f2ef927f3194a61b99"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.BTC)
+        );
+        assertArrayEquals(
+            Hex.decode("02a23343f50363dc9a4c29f0c0a8386780cc8bf469211f4de51d50f8c0f274e9a7"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.RSK)
+        );
+        assertArrayEquals(
+            Hex.decode("030dd584c286275ab2ce249096d0d7e6c78853e0902db061b14f2e39df068f95bc"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(0, KeyType.MST)
+        );
 
-        assertTrue(Arrays.equals(Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"), bridgeSupport.getPendingFederatorPublicKeyOfType(1, FederationMember.KeyType.BTC)));
-        assertTrue(Arrays.equals(Hex.decode("03f64d2c022bca70f3ff0b1e95336be2c1507daa2ad37a484e0b66cbda86cfc6c5"), bridgeSupport.getPendingFederatorPublicKeyOfType(1, FederationMember.KeyType.RSK)));
-        assertTrue(Arrays.equals(Hex.decode("03eed62698319f754407a31fde9a51da8b2be0ab40e9c4c695bb057757729be37f"), bridgeSupport.getPendingFederatorPublicKeyOfType(1, FederationMember.KeyType.MST)));
+        assertArrayEquals(
+            Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.BTC)
+        );
+        assertArrayEquals(
+            Hex.decode("03f64d2c022bca70f3ff0b1e95336be2c1507daa2ad37a484e0b66cbda86cfc6c5"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.RSK)
+        );
+        assertArrayEquals(
+            Hex.decode("03eed62698319f754407a31fde9a51da8b2be0ab40e9c4c695bb057757729be37f"),
+            bridgeSupport.getPendingFederatorPublicKeyOfType(1, KeyType.MST)
+        );
 
         verify(mocksProvider.getElection(), times(1)).clearWinners();
         verify(mocksProvider.getElection(), never()).clear();
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_noPendingFederation() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_noPendingFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a"),
             Hex.decode("0259323a848372c51673622b29298b6e5854b28d45de297fe7cff67915ad900a59"),
@@ -2913,14 +2968,14 @@ void addFederatorPublicKeyMultikey_noPendingFederation() throws BridgeIllegalArg
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_btcKeyExists() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_btcKeyExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             Hex.decode("02cf0dec68ca34502e4ebd35c40a0e66ff47ba520f0418bcd7388717b12ab4b053"),
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, false);
 
-        PendingFederation pendingFederation = new PendingFederation(Arrays.asList(new FederationMember(
+        PendingFederation pendingFederation = new PendingFederation(Collections.singletonList(new FederationMember(
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")),
             ECKey.fromPublicOnly(Hex.decode("03981d06bd7bc419612aa09f860188f08d3c3010796dcb41cdfc43a6875600efa8")),
             ECKey.fromPublicOnly(Hex.decode("0365e45f68d6347aaa03c76f3d6f47000df6090801e49eef6d49f547f5c19de5dd"))
@@ -2944,14 +2999,14 @@ void addFederatorPublicKeyMultikey_btcKeyExists() throws BridgeIllegalArgumentEx
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_rskKeyExists() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_rskKeyExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             Hex.decode("02cf0dec68ca34502e4ebd35c40a0e66ff47ba520f0418bcd7388717b12ab4b053"),
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, false);
 
-        PendingFederation pendingFederation = new PendingFederation(Arrays.asList(new FederationMember(
+        PendingFederation pendingFederation = new PendingFederation(Collections.singletonList(new FederationMember(
             BtcECKey.fromPublicOnly(Hex.decode("0290d68bf50a8389e541a19d47c51447b443f41a13049e0783db6a25c419d612db")),
             ECKey.fromPublicOnly(Hex.decode("02cf0dec68ca34502e4ebd35c40a0e66ff47ba520f0418bcd7388717b12ab4b053")),
             ECKey.fromPublicOnly(Hex.decode("0365e45f68d6347aaa03c76f3d6f47000df6090801e49eef6d49f547f5c19de5dd"))
@@ -2975,14 +3030,14 @@ void addFederatorPublicKeyMultikey_rskKeyExists() throws BridgeIllegalArgumentEx
     }
 
     @Test
-    void addFederatorPublicKeyMultikey_mstKeyExists() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKeyMultikey_mstKeyExists() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"),
             Hex.decode("02cf0dec68ca34502e4ebd35c40a0e66ff47ba520f0418bcd7388717b12ab4b053"),
             Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")
         }, false);
 
-        PendingFederation pendingFederation = new PendingFederation(Arrays.asList(new FederationMember(
+        PendingFederation pendingFederation = new PendingFederation(Collections.singletonList(new FederationMember(
             BtcECKey.fromPublicOnly(Hex.decode("0290d68bf50a8389e541a19d47c51447b443f41a13049e0783db6a25c419d612db")),
             ECKey.fromPublicOnly(Hex.decode("033174d2fb7a3d7a0c87d43fa3e9ba43d4962014960b82bcd793706c05f68111c8")),
             ECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
@@ -3006,7 +3061,7 @@ void addFederatorPublicKeyMultikey_mstKeyExists() throws BridgeIllegalArgumentEx
     }
 
     @Test
-    void addFederatorPublicKey_invalidBtcKey() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_invalidBtcKey() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("aabbccdd"),
             Hex.decode("0245db19d3d4b8c3567a47189ae60588e18e1305f3473a7fe99b6ef559bb1d1dc6"),
@@ -3032,7 +3087,7 @@ void addFederatorPublicKey_invalidBtcKey() throws BridgeIllegalArgumentException
     }
 
     @Test
-    void addFederatorPublicKey_invalidRskKey() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_invalidRskKey() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("0245db19d3d4b8c3567a47189ae60588e18e1305f3473a7fe99b6ef559bb1d1dc6"),
             Hex.decode("aabbccdd"),
@@ -3058,7 +3113,7 @@ void addFederatorPublicKey_invalidRskKey() throws BridgeIllegalArgumentException
     }
 
     @Test
-    void addFederatorPublicKey_invalidMstKey() throws BridgeIllegalArgumentException {
+    void addFederatorPublicKey_invalidMstKey() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("add-multi", new byte[][]{
             Hex.decode("0245db19d3d4b8c3567a47189ae60588e18e1305f3473a7fe99b6ef559bb1d1dc6"),
             Hex.decode("029664581b2e8dc9ba7885696a03134aaebe4be834ce0049d62f80499bbe130206"),
@@ -3084,7 +3139,7 @@ void addFederatorPublicKey_invalidMstKey() throws BridgeIllegalArgumentException
     }
 
     @Test
-    void rollbackFederation_ok() throws BridgeIllegalArgumentException {
+    void rollbackFederation_ok() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("rollback", new byte[][]{}, true);
 
         PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
@@ -3117,7 +3172,7 @@ void rollbackFederation_ok() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void rollbackFederation_noPendingFederation() throws BridgeIllegalArgumentException {
+    void rollbackFederation_noPendingFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("rollback", new byte[][]{}, true);
 
         BridgeSupport bridgeSupport = getBridgeSupportWithMocksForFederationTests(
@@ -3139,7 +3194,7 @@ void rollbackFederation_noPendingFederation() throws BridgeIllegalArgumentExcept
     }
 
     @Test
-    void commitFederation_ok() throws BridgeIllegalArgumentException {
+    void commitFederation_ok() {
         NetworkParameters btcParams = NetworkParameters.fromID(NetworkParameters.ID_REGTEST);
         PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(
             BtcECKey.fromPublicOnly(Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")),
@@ -3174,14 +3229,11 @@ void commitFederation_ok() throws BridgeIllegalArgumentException {
             expectedFedArgs
         );
 
-        List<FederationMember> newFederationMembers =
-            FederationTestUtils.getFederationMembersWithKeys(
-                Arrays.asList(
-                    BtcECKey.fromPublicOnly(Hex.decode("0346cb6b905e4dee49a862eeb2288217d06afcd4ace4b5ca77ebedfbc6afc1c19d")),
-                    BtcECKey.fromPublicOnly(Hex.decode("0269a0dbe7b8f84d1b399103c466fb20531a56b1ad3a7b44fe419e74aad8c46db7")),
-                    BtcECKey.fromPublicOnly(Hex.decode("026192d8ab41bd402eb0431457f6756a3f3ce15c955c534d2b87f1e0372d8ba338"))
-                )
-            );
+        List<FederationMember> newFederationMembers = FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(
+            BtcECKey.fromPublicOnly(Hex.decode("0346cb6b905e4dee49a862eeb2288217d06afcd4ace4b5ca77ebedfbc6afc1c19d")),
+            BtcECKey.fromPublicOnly(Hex.decode("0269a0dbe7b8f84d1b399103c466fb20531a56b1ad3a7b44fe419e74aad8c46db7")),
+            BtcECKey.fromPublicOnly(Hex.decode("026192d8ab41bd402eb0431457f6756a3f3ce15c955c534d2b87f1e0372d8ba338"))
+        ));
         FederationArgs newFederationArgs = new FederationArgs(newFederationMembers,
             Instant.ofEpochMilli(5005L),
             0L,
@@ -3256,7 +3308,7 @@ void commitFederation_ok() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void commitFederation_noPendingFederation() throws BridgeIllegalArgumentException {
+    void commitFederation_noPendingFederation() {
         VotingMocksProvider mocksProvider = new VotingMocksProvider("commit", new byte[][]{
             new Keccak256(HashUtil.keccak256(Hex.decode("aabbcc"))).getBytes()
         }, true);
@@ -3279,7 +3331,7 @@ void commitFederation_noPendingFederation() throws BridgeIllegalArgumentExceptio
     }
 
     @Test
-    void commitFederation_incompleteFederation() throws BridgeIllegalArgumentException {
+    void commitFederation_incompleteFederation() {
         PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
         })));
@@ -3307,7 +3359,7 @@ void commitFederation_incompleteFederation() throws BridgeIllegalArgumentExcepti
     }
 
     @Test
-    void commitFederation_hashMismatch() throws BridgeIllegalArgumentException {
+    void commitFederation_hashMismatch() {
         PendingFederation pendingFederation = new PendingFederation(FederationTestUtils.getFederationMembersWithKeys(Arrays.asList(new BtcECKey[]{
             BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5")),
             BtcECKey.fromPublicOnly(Hex.decode("025eefeeeed5cdc40822880c7db1d0a88b7b986945ed3fc05a0b45fe166fe85e12"))
@@ -3336,7 +3388,7 @@ void commitFederation_hashMismatch() throws BridgeIllegalArgumentException {
     }
 
     @Test
-    void getActiveFederationWallet() throws IOException {
+    void getActiveFederationWallet() {
         List<FederationMember> expectedFederationMembers =
             FederationTestUtils.getFederationMembersWithBtcKeys(
                 Arrays.asList(
@@ -3374,7 +3426,7 @@ void getActiveFederationWallet() throws IOException {
             bridgeUtilsMocked.when(() -> BridgeUtils.getFederationSpendWallet(any(), any(), any(), anyBoolean(), any())).then((InvocationOnMock m) -> {
                 assertEquals(m.<Context>getArgument(0), expectedContext);
                 assertEquals(m.<Federation>getArgument(1), expectedFederation);
-                assertEquals(m.<Object>getArgument(2), expectedUtxos);
+                assertEquals(m.getArgument(2), expectedUtxos);
                 return expectedWallet;
             });
 
@@ -3383,7 +3435,7 @@ void getActiveFederationWallet() throws IOException {
     }
 
     @Test
-    void getRetiringFederationWallet_nonEmpty() throws IOException {
+    void getRetiringFederationWallet_nonEmpty() {
         FederationArgs mockedFedArgs = new FederationArgs(FederationTestUtils.getFederationMembers(2),
             Instant.ofEpochMilli(2000),
             10L,
@@ -3393,11 +3445,10 @@ void getRetiringFederationWallet_nonEmpty() throws IOException {
             mockedFedArgs
         );
 
-        List<FederationMember> expectedFederationMembers = FederationTestUtils.getFederationMembersWithBtcKeys(
-            Arrays.asList(new BtcECKey[]{
-                BtcECKey.fromPublicOnly(Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")),
-                BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
-            }));
+        List<FederationMember> expectedFederationMembers = FederationTestUtils.getFederationMembersWithBtcKeys(Arrays.asList(
+            BtcECKey.fromPublicOnly(Hex.decode("036bb9eab797eadc8b697f0e82a01d01cabbfaaca37e5bafc06fdc6fdd38af894a")),
+            BtcECKey.fromPublicOnly(Hex.decode("031da807c71c2f303b7f409dd2605b297ac494a563be3b9ca5f52d95a43d183cc5"))
+        ));
         FederationArgs expectedFederationArgs = new FederationArgs(
             expectedFederationMembers,
             Instant.ofEpochMilli(5005L),
@@ -3433,7 +3484,7 @@ void getRetiringFederationWallet_nonEmpty() throws IOException {
             bridgeUtilsMocked.when(() -> BridgeUtils.getFederationSpendWallet(any(), any(), any(), anyBoolean(), any())).then((InvocationOnMock m) -> {
                 assertEquals(m.<Context>getArgument(0), expectedContext);
                 assertEquals(m.<Federation>getArgument(1), expectedFederation);
-                assertEquals(m.<Object>getArgument(2), expectedUtxos);
+                assertEquals(m.getArgument(2), expectedUtxos);
                 return expectedWallet;
             });
 
@@ -3838,8 +3889,6 @@ void getBtcTransactionConfirmationsGetCost_getBestChainHeightError() {
 
     @Test
     void getBtcTransactionConfirmationsGetCost_blockTooDeep() {
-        ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
-
         Repository repository = createRepository();
         Repository track = repository.startTracking();
 
@@ -3939,8 +3988,9 @@ private BridgeStorageProvider getBridgeStorageProviderMockWithProcessedHashes()
         BridgeStorageProvider providerMock = mock(BridgeStorageProvider.class);
 
         for (int i = 0; i < 10; i++) {
-            when(providerMock.getHeightIfBtcTxhashIsAlreadyProcessed(Sha256Hash.of(("hash_" + i).getBytes())))
-                .thenReturn(Optional.of(Long.valueOf(i)));
+            when(providerMock.getHeightIfBtcTxhashIsAlreadyProcessed(Sha256Hash.of(("hash_" + i).getBytes()))).thenReturn(
+                Optional.of((long) i)
+            );
         }
 
         return providerMock;
@@ -4121,8 +4171,8 @@ class FederationHolder {
             private Federation retiringFederation;
             private ABICallElection federationElection;
 
-            public List<UTXO> retiringUTXOs = new ArrayList<>();
-            public List<UTXO> activeUTXOs = new ArrayList<>();
+            public final List<UTXO> retiringUTXOs = new ArrayList<>();
+            public final List<UTXO> activeUTXOs = new ArrayList<>();
 
             PendingFederation getPendingFederation() {
                 return pendingFederation;
@@ -4183,15 +4233,15 @@ public void setFederationElection(ABICallElection federationElection) {
             return holder.getFederationElection();
         });
         doAnswer((InvocationOnMock m) -> {
-            holder.setActiveFederation(m.<Federation>getArgument(0));
+            holder.setActiveFederation(m.getArgument(0));
             return null;
         }).when(federationStorageProvider).setNewFederation(any());
         doAnswer((InvocationOnMock m) -> {
-            holder.setRetiringFederation(m.<Federation>getArgument(0));
+            holder.setRetiringFederation(m.getArgument(0));
             return null;
         }).when(federationStorageProvider).setOldFederation(any());
         doAnswer((InvocationOnMock m) -> {
-            holder.setPendingFederation(m.<PendingFederation>getArgument(0));
+            holder.setPendingFederation(m.getArgument(0));
             return null;
         }).when(federationStorageProvider).setPendingFederation(any());
 
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
index 3fe2e995911..87c76d07591 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
@@ -516,7 +516,7 @@ void updateFederationCreationBlockHeights_callsFederationSupportUpdateFederation
         }
 
         @Test
-        void save_callsFederationSupportSave() throws IOException {
+        void save_callsFederationSupportSave() {
             bridgeSupport.save();
             verify(federationSupport).save();
         }
diff --git a/rskj-core/src/test/java/co/rsk/peg/performance/HasBtcBlockCoinbaseTransactionInformationTest.java b/rskj-core/src/test/java/co/rsk/peg/performance/HasBtcBlockCoinbaseTransactionInformationTest.java
index ade10e09daf..9a939841e12 100644
--- a/rskj-core/src/test/java/co/rsk/peg/performance/HasBtcBlockCoinbaseTransactionInformationTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/performance/HasBtcBlockCoinbaseTransactionInformationTest.java
@@ -2,20 +2,13 @@
 
 import co.rsk.bitcoinj.core.Sha256Hash;
 import co.rsk.bitcoinj.store.BtcBlockStore;
-import co.rsk.peg.Bridge;
-import co.rsk.peg.BridgeMethods;
-import co.rsk.peg.BridgeStorageProvider;
+import co.rsk.peg.*;
 import co.rsk.peg.bitcoin.CoinbaseInformation;
 import org.ethereum.config.Constants;
 import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest;
 import org.ethereum.core.Repository;
 import org.ethereum.vm.exception.VMException;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
+import org.junit.jupiter.api.*;
 
 @Disabled
 class HasBtcBlockCoinbaseTransactionInformationTest extends BridgePerformanceTestCase {
@@ -42,28 +35,28 @@ private void hasBtcBlockCoinbaseTransactionInformation_success(int times, Execut
         );
 
         executeAndAverage("hasBtcBlockCoinbaseTransactionInformation-sucess",
-                times,
-                getABIEncoder(Sha256Hash.ZERO_HASH),
-                storageInitializer,
-                Helper.getZeroValueValueTxBuilderFromFedMember(),
-                Helper.getRandomHeightProvider(10),
-                stats,
-                (environment, callResult) -> Assertions.assertTrue((boolean) Bridge.HAS_BTC_BLOCK_COINBASE_TRANSACTION_INFORMATION.decodeResult(callResult)[0]));
+            times,
+            getABIEncoder(Sha256Hash.ZERO_HASH),
+            storageInitializer,
+            Helper.getZeroValueValueTxBuilderFromFedMember(),
+            Helper.getRandomHeightProvider(10),
+            stats,
+            (environment, callResult) -> Assertions.assertTrue((boolean) Bridge.HAS_BTC_BLOCK_COINBASE_TRANSACTION_INFORMATION.decodeResult(callResult)[0]));
     }
 
     private void hasBtcBlockCoinbaseTransactionInformation_unsuccess(int times, ExecutionStats stats) throws VMException {
         BridgeStorageProviderInitializer storageInitializer = generateInitializerForTest(
-                Sha256Hash.ZERO_HASH
+            Sha256Hash.ZERO_HASH
         );
 
         executeAndAverage("hasBtcBlockCoinbaseTransactionInformation-unsucess",
-                times,
-                getABIEncoder(Sha256Hash.of(new byte[]{1})),
-                storageInitializer,
-                Helper.getZeroValueValueTxBuilderFromFedMember(),
-                Helper.getRandomHeightProvider(10),
-                stats,
-                (environment, callResult) -> Assertions.assertFalse((boolean) Bridge.HAS_BTC_BLOCK_COINBASE_TRANSACTION_INFORMATION.decodeResult(callResult)[0]));
+            times,
+            getABIEncoder(Sha256Hash.of(new byte[]{1})),
+            storageInitializer,
+            Helper.getZeroValueValueTxBuilderFromFedMember(),
+            Helper.getRandomHeightProvider(10),
+            stats,
+            (environment, callResult) -> Assertions.assertFalse((boolean) Bridge.HAS_BTC_BLOCK_COINBASE_TRANSACTION_INFORMATION.decodeResult(callResult)[0]));
     }
 
     private ABIEncoder getABIEncoder(Sha256Hash blockHash) {
@@ -79,12 +72,7 @@ private BridgeStorageProviderInitializer generateInitializerForTest(Sha256Hash b
             witnessRoot = Sha256Hash.ZERO_HASH;
             CoinbaseInformation coinbaseInformation = new CoinbaseInformation(witnessRoot);
             provider.setCoinbaseInformation(blockHash, coinbaseInformation);
-
-            try{
-                provider.save();
-            } catch (IOException e) {
-                throw new RuntimeException();
-            }
+            provider.save();
         };
     }
 }