Merge pull request #2676 from rsksmart/federation-refactors-adjustments

Federation refactors adjustments
rsksmart · Aug 8, 2024 · 04e7eec · 04e7eec
2 parents 37482c2 + 4d9082f
commit 04e7eec
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 761 deletions.
diff --git a/...eg/storage/FederationStorageIndexKey.java → ...federation/FederationStorageIndexKey.java b/...eg/storage/FederationStorageIndexKey.java → ...federation/FederationStorageIndexKey.java
@@ -1,4 +1,4 @@
-package co.rsk.peg.storage;
+package co.rsk.peg.federation;
 
 import org.ethereum.vm.DataWord;
 

diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/FederationStorageProviderImpl.java b/rskj-core/src/main/java/co/rsk/peg/federation/FederationStorageProviderImpl.java
@@ -16,7 +16,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import static co.rsk.peg.storage.FederationStorageIndexKey.*;
+import static co.rsk.peg.federation.FederationStorageIndexKey.*;
 import static co.rsk.peg.federation.FederationFormatVersion.*;
 import static org.ethereum.config.blockchain.upgrades.ConsensusRule.*;
 

diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeStorageProviderTest.java
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,6 +42,7 @@
 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.utils.BridgeEventLogger;
 import co.rsk.peg.vote.ABICallElection;

diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportTest.java
@@ -34,6 +34,7 @@
 import co.rsk.peg.feeperkb.FeePerKbSupport;
 import co.rsk.peg.feeperkb.FeePerKbSupportImpl;
 import co.rsk.peg.storage.BridgeStorageAccessorImpl;
+import co.rsk.peg.storage.InMemoryStorage;
 import co.rsk.peg.storage.StorageAccessor;
 import co.rsk.peg.bitcoin.BitcoinTestUtils;
 import co.rsk.peg.bitcoin.CoinbaseInformation;

diff --git a/rskj-core/src/test/java/co/rsk/peg/federation/FederationStorageProviderImplTests.java b/rskj-core/src/test/java/co/rsk/peg/federation/FederationStorageProviderImplTests.java
@@ -22,7 +22,7 @@
 import static co.rsk.bitcoinj.core.NetworkParameters.ID_TESTNET;
 import static co.rsk.bitcoinj.core.NetworkParameters.ID_MAINNET;
 import static co.rsk.peg.federation.FederationFormatVersion.*;
-import static co.rsk.peg.storage.FederationStorageIndexKey.*;
+import static co.rsk.peg.federation.FederationStorageIndexKey.*;
 import static co.rsk.peg.BridgeSerializationUtils.serializeElection;
 import co.rsk.bitcoinj.script.Script;
 import co.rsk.core.RskAddress;
@@ -33,12 +33,11 @@
 import co.rsk.bitcoinj.core.BtcECKey;
 import co.rsk.bitcoinj.core.NetworkParameters;
 import co.rsk.peg.BridgeSerializationUtils;
-import co.rsk.peg.InMemoryStorage;
+import co.rsk.peg.storage.InMemoryStorage;
 import co.rsk.peg.PegTestUtils;
 import co.rsk.peg.bitcoin.BitcoinTestUtils;
 import co.rsk.peg.constants.BridgeConstants;
 import co.rsk.peg.constants.BridgeMainNetConstants;
-import co.rsk.peg.storage.FederationStorageIndexKey;
 import co.rsk.peg.constants.BridgeRegTestConstants;
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.storage.BridgeStorageAccessorImpl;

diff --git a/rskj-core/src/test/java/co/rsk/peg/federation/FederationSupportImplTest.java b/rskj-core/src/test/java/co/rsk/peg/federation/FederationSupportImplTest.java
@@ -17,8 +17,8 @@
  */
 package co.rsk.peg.federation;
 
-import static co.rsk.peg.storage.FederationStorageIndexKey.NEW_FEDERATION_BTC_UTXOS_KEY;
-import static co.rsk.peg.storage.FederationStorageIndexKey.OLD_FEDERATION_BTC_UTXOS_KEY;
+import static co.rsk.peg.federation.FederationStorageIndexKey.NEW_FEDERATION_BTC_UTXOS_KEY;
+import static co.rsk.peg.federation.FederationStorageIndexKey.OLD_FEDERATION_BTC_UTXOS_KEY;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -36,6 +36,7 @@
 import co.rsk.peg.federation.FederationMember.KeyType;
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.federation.constants.FederationMainNetConstants;
+import co.rsk.peg.storage.InMemoryStorage;
 import co.rsk.peg.utils.BridgeEventLoggerImpl;
 import co.rsk.util.HexUtils;
 import java.math.BigInteger;

diff --git a/rskj-core/src/test/java/co/rsk/peg/feeperkb/FeePerKbIT.java b/rskj-core/src/test/java/co/rsk/peg/feeperkb/FeePerKbIT.java
@@ -6,7 +6,7 @@
 
 import co.rsk.bitcoinj.core.Coin;
 import co.rsk.core.RskAddress;
-import co.rsk.peg.InMemoryStorage;
+import co.rsk.peg.storage.InMemoryStorage;
 import co.rsk.peg.feeperkb.constants.FeePerKbConstants;
 import co.rsk.peg.feeperkb.constants.FeePerKbMainNetConstants;
 import co.rsk.peg.storage.StorageAccessor;

diff --git a/...test/java/co/rsk/peg/InMemoryStorage.java → ...a/co/rsk/peg/storage/InMemoryStorage.java b/...test/java/co/rsk/peg/InMemoryStorage.java → ...a/co/rsk/peg/storage/InMemoryStorage.java
@@ -1,6 +1,5 @@
-package co.rsk.peg;
+package co.rsk.peg.storage;
 
-import co.rsk.peg.storage.StorageAccessor;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;

diff --git a/rskj-core/src/test/java/co/rsk/peg/whitelist/WhitelistStorageProviderImplTest.java b/rskj-core/src/test/java/co/rsk/peg/whitelist/WhitelistStorageProviderImplTest.java
@@ -12,7 +12,7 @@
 import co.rsk.bitcoinj.core.Coin;
 import co.rsk.bitcoinj.core.NetworkParameters;
 import co.rsk.peg.BridgeSerializationUtils;
-import co.rsk.peg.InMemoryStorage;
+import co.rsk.peg.storage.InMemoryStorage;
 import co.rsk.peg.bitcoin.BitcoinTestUtils;
 import co.rsk.peg.storage.StorageAccessor;
 import co.rsk.peg.whitelist.constants.WhitelistConstants;

diff --git a/rskj-core/src/test/java/co/rsk/peg/whitelist/WhitelistSupportImplTest.java b/rskj-core/src/test/java/co/rsk/peg/whitelist/WhitelistSupportImplTest.java
@@ -10,7 +10,7 @@
 import co.rsk.bitcoinj.core.NetworkParameters;
 import co.rsk.net.utils.TransactionUtils;
 import co.rsk.peg.BridgeSerializationUtils;
-import co.rsk.peg.InMemoryStorage;
+import co.rsk.peg.storage.InMemoryStorage;
 import co.rsk.peg.bitcoin.BitcoinTestUtils;
 import co.rsk.peg.storage.StorageAccessor;
 import co.rsk.peg.whitelist.constants.WhitelistConstants;