From 2dd40f73f480a2d9cff446ae9afc391e9714f791 Mon Sep 17 00:00:00 2001 From: Marcos Date: Thu, 8 Aug 2024 13:49:48 -0300 Subject: [PATCH] Update InMemoryStorage imports --- .../co/rsk/peg/federation/PowpegMigrationTest.java | 13 +++---------- .../LockingCapStorageProviderImplTest.java | 2 +- .../peg/lockingcap/LockingCapSupportImplTest.java | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/rskj-core/src/test/java/co/rsk/peg/federation/PowpegMigrationTest.java b/rskj-core/src/test/java/co/rsk/peg/federation/PowpegMigrationTest.java index d62afdc4d5c..6d27819f97e 100644 --- a/rskj-core/src/test/java/co/rsk/peg/federation/PowpegMigrationTest.java +++ b/rskj-core/src/test/java/co/rsk/peg/federation/PowpegMigrationTest.java @@ -14,12 +14,10 @@ import co.rsk.peg.federation.constants.FederationConstants; import co.rsk.peg.feeperkb.FeePerKbSupport; import co.rsk.peg.PegoutsWaitingForConfirmations.Entry; -import co.rsk.peg.lockingcap.LockingCapStorageProvider; -import co.rsk.peg.lockingcap.LockingCapStorageProviderImpl; -import co.rsk.peg.lockingcap.LockingCapSupport; -import co.rsk.peg.lockingcap.LockingCapSupportImpl; +import co.rsk.peg.lockingcap.*; import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants; import co.rsk.peg.storage.BridgeStorageAccessorImpl; +import co.rsk.peg.storage.InMemoryStorage; import co.rsk.peg.storage.StorageAccessor; import co.rsk.peg.vote.ABICallSpec; import co.rsk.peg.bitcoin.BitcoinUtils; @@ -37,12 +35,7 @@ import org.ethereum.config.blockchain.upgrades.ActivationConfig; import org.ethereum.config.blockchain.upgrades.ActivationConfigsForTest; import org.ethereum.config.blockchain.upgrades.ConsensusRule; -import org.ethereum.core.Block; -import org.ethereum.core.BlockTxSignatureCache; -import org.ethereum.core.ReceivedTxSignatureCache; -import org.ethereum.core.Repository; -import org.ethereum.core.SignatureCache; -import org.ethereum.core.Transaction; +import org.ethereum.core.*; import org.ethereum.crypto.ECKey; import org.ethereum.crypto.HashUtil; import org.ethereum.db.MutableRepository; diff --git a/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImplTest.java b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImplTest.java index 3aea5f1bd0c..c761f624814 100644 --- a/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImplTest.java +++ b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapStorageProviderImplTest.java @@ -4,9 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import co.rsk.bitcoinj.core.Coin; -import co.rsk.peg.InMemoryStorage; import co.rsk.peg.lockingcap.constants.LockingCapConstants; import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants; +import co.rsk.peg.storage.InMemoryStorage; import co.rsk.peg.storage.StorageAccessor; import java.util.Optional; import org.ethereum.config.blockchain.upgrades.ActivationConfig; diff --git a/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapSupportImplTest.java b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapSupportImplTest.java index bc0d740ea08..faa02955d58 100644 --- a/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapSupportImplTest.java +++ b/rskj-core/src/test/java/co/rsk/peg/lockingcap/LockingCapSupportImplTest.java @@ -7,9 +7,9 @@ import co.rsk.bitcoinj.core.Coin; import co.rsk.net.utils.TransactionUtils; -import co.rsk.peg.InMemoryStorage; import co.rsk.peg.lockingcap.constants.LockingCapConstants; import co.rsk.peg.lockingcap.constants.LockingCapMainNetConstants; +import co.rsk.peg.storage.InMemoryStorage; import co.rsk.peg.storage.StorageAccessor; import java.util.Optional; import org.ethereum.config.blockchain.upgrades.ActivationConfig;