[ETCM-759] Move miner tests to 'miners' package

input-output-hk · Apr 17, 2021 · ee8c9fb · ee8c9fb
1 parent b9cd01a
commit ee8c9fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/...ereum/consensus/pow/EthashMinerSpec.scala → ...onsensus/pow/miners/EthashMinerSpec.scala b/...ereum/consensus/pow/EthashMinerSpec.scala → ...onsensus/pow/miners/EthashMinerSpec.scala
@@ -1,26 +1,26 @@
-package io.iohk.ethereum.consensus
-package pow
+package io.iohk.ethereum.consensus.pow.miners
 
 import akka.actor.{ActorRef, ActorSystem}
 import akka.testkit.{TestActor, TestActorRef, TestKit, TestProbe}
-import io.iohk.ethereum.{Fixtures, WithActorSystemShutDown}
 import io.iohk.ethereum.consensus.blocks.{PendingBlock, PendingBlockAndState}
 import io.iohk.ethereum.consensus.pow.validators.PoWBlockHeaderValidator
+import io.iohk.ethereum.consensus.pow.EthashUtils
 import io.iohk.ethereum.consensus.validators.BlockHeaderValid
 import io.iohk.ethereum.domain._
-import io.iohk.ethereum.jsonrpc.{EthInfoService, EthMiningService}
 import io.iohk.ethereum.jsonrpc.EthMiningService.SubmitHashRateResponse
+import io.iohk.ethereum.jsonrpc.{EthInfoService, EthMiningService}
 import io.iohk.ethereum.ommers.OmmersPool
 import io.iohk.ethereum.transactions.PendingTransactionsManager
+import io.iohk.ethereum.{Fixtures, WithActorSystemShutDown}
 import monix.eval.Task
 import org.bouncycastle.util.encoders.Hex
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.Tag
-
-import scala.concurrent.duration._
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.matchers.should.Matchers
 
+import scala.concurrent.duration._
+
 class EthashMinerSpec
     extends TestKit(ActorSystem("EthashMinerSpec_System"))
     with AnyFlatSpecLike

diff --git a/...hereum/consensus/pow/MinerSpecSetup.scala → ...consensus/pow/miners/MinerSpecSetup.scala b/...hereum/consensus/pow/MinerSpecSetup.scala → ...consensus/pow/miners/MinerSpecSetup.scala
@@ -1,11 +1,12 @@
-package io.iohk.ethereum.consensus.pow
+package io.iohk.ethereum.consensus.pow.miners
 
 import akka.actor.ActorSystem
 import akka.testkit.{TestActorRef, TestProbe}
 import akka.util.ByteString
 import io.iohk.ethereum.Fixtures
 import io.iohk.ethereum.blockchain.sync.{ScenarioSetup, SyncProtocol}
 import io.iohk.ethereum.consensus.blocks.{PendingBlock, PendingBlockAndState}
+import io.iohk.ethereum.consensus.pow.PoWConsensus
 import io.iohk.ethereum.consensus.pow.blocks.PoWBlockGenerator
 import io.iohk.ethereum.consensus.pow.difficulty.EthashDifficultyCalculator
 import io.iohk.ethereum.domain._
@@ -14,6 +15,7 @@ import io.iohk.ethereum.ledger.Ledger.VMImpl
 import monix.eval.Task
 import org.bouncycastle.util.encoders.Hex
 import org.scalamock.scalatest.MockFactory
+
 import scala.concurrent.duration.{Duration, FiniteDuration}
 
 abstract class MinerSpecSetup(implicit system: ActorSystem) extends ScenarioSetup with MockFactory {

diff --git a/...ereum/consensus/pow/MockedMinerSpec.scala → ...onsensus/pow/miners/MockedMinerSpec.scala b/...ereum/consensus/pow/MockedMinerSpec.scala → ...onsensus/pow/miners/MockedMinerSpec.scala
@@ -1,18 +1,18 @@
-package io.iohk.ethereum.consensus.pow
+package io.iohk.ethereum.consensus.pow.miners
 
 import akka.actor.ActorSystem
 import akka.testkit.{TestActorRef, TestKit}
 import io.iohk.ethereum.WithActorSystemShutDown
-import io.iohk.ethereum.consensus.pow.MinerResponses.{MinerIsWorking, MinerNotSupport, MiningError, MiningOrdered}
 import io.iohk.ethereum.domain.{Block, SignedTransaction}
 import io.iohk.ethereum.ledger.InMemoryWorldStateProxy
 import io.iohk.ethereum.utils.ByteStringUtils
 import monix.eval.Task
 import org.scalatest._
-import scala.concurrent.duration._
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
+import scala.concurrent.duration._
+
 class MockedMinerSpec
     extends TestKit(ActorSystem("MockedPowMinerSpec_System"))
     with AnyWordSpecLike