[ETCM-1001] Rename consensus classes to mining (#1053)

* ETCM-1001 Rename trait Consensus to Mining (and all variables that instantiate it)
* ETCM-1001 Rename TestConsensus to TestMining (and al variables that instantiate it)
* ETCM-1001 Rename PoWConsensus to PowMining (and all variables that instantiate it)
* ETCM-1001 Rename ConsensusBuilder to MiningBuilder
* ETCM-1001 Rename StdConsensusBuilder to StdMiningBuilder
* ETCM-1001 Rename TestConsensusBuilder to TestMiningBuilder
* ETCM-1001 Rename StdTestConsensusBuilder to StdTestMiningBuilder
* ETCM-1001 Rename ConsensusConfig to MiningConfig (and all variables that instantiate it)
* ETCM-1001 Rename ConsensusConfigBuilder to MiningConfigBuilder
* ETCM-1001 Rename TestmodeConsensusBuilder to TestmodeMiningBuilder
* ETCM-1001 Rename PoWConsensusSpec to PoWMiningSpec
* ETCM-1001 Rename FullConsensusConfig to FullMiningConfig (and all variables that instantiate it)
* ETCM-1001 Rename ConsensusConfigs to MiningConfigs
* ETCM-1001 Rename TestmodeConsensus to TestmodeMining
* ETCM-1001 Rename RichConsensus to RichMining
* ETCM-1001 Rename ConsensusSpec to MiningSpec
* ETCM-1001 Rename TestConsensus to TestMining (and all variables that )
* ETCM-1001 Rename ConsensusMetrics to MiningMetrics
* ETCM-1001 Create new package mining and move related code there
* ETCM-1001 Rename configuration key from consensus to mining

Author: Leonor Boga

docker/mantis/grafana/provisioning/dashboards/mantis-dashboard.json

@@ -1930,7 +1930,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "rate(app_consensus_blocks_generate_timer_seconds_sum[$__rate_interval])/rate(app_consensus_blocks_generate_timer_seconds_count[$__rate_interval])",
+              "expr": "rate(app_mining_blocks_generate_timer_seconds_sum[$__rate_interval])/rate(app_mining_blocks_generate_timer_seconds_count[$__rate_interval])",
               "interval": "",
               "legendFormat": "{{class}}",
               "refId": "A"
@@ -2027,7 +2027,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "app_consensus_blocks_generate_timer_seconds_max",
+              "expr": "app_mining_blocks_generate_timer_seconds_max",
               "interval": "",
               "legendFormat": "{{class}}",
               "refId": "A"
@@ -2124,7 +2124,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "rate(app_consensus_minedblocks_evaluation_timer_seconds_sum[$__rate_interval]) / rate(app_consensus_minedblocks_evaluation_timer_seconds_count[$__rate_interval])\n",
+              "expr": "rate(app_mining_minedblocks_evaluation_timer_seconds_sum[$__rate_interval]) / rate(app_mining_minedblocks_evaluation_timer_seconds_count[$__rate_interval])\n",
               "interval": "",
               "legendFormat": "",
               "refId": "A"
@@ -7866,4 +7866,4 @@
   "title": "Mantis",
   "uid": "L3y-GTyWk",
   "version": 4
-}
+}

src/it/scala/io/iohk/ethereum/ledger/BlockImporterItSpec.scala

@@ -26,9 +26,9 @@ import io.iohk.ethereum.blockchain.sync.regular.BlockFetcher
 import io.iohk.ethereum.blockchain.sync.regular.BlockImporter
 import io.iohk.ethereum.blockchain.sync.regular.BlockImporter.NewCheckpoint
 import io.iohk.ethereum.checkpointing.CheckpointingTestHelpers
-import io.iohk.ethereum.consensus.GetBlockHeaderByHash
-import io.iohk.ethereum.consensus.GetNBlocksBack
 import io.iohk.ethereum.consensus.blocks.CheckpointBlockGenerator
+import io.iohk.ethereum.consensus.mining.GetBlockHeaderByHash
+import io.iohk.ethereum.consensus.mining.GetNBlocksBack
 import io.iohk.ethereum.consensus.pow.validators.OmmersValidator
 import io.iohk.ethereum.consensus.pow.validators.StdOmmersValidator
 import io.iohk.ethereum.consensus.validators.Validators
@@ -252,8 +252,8 @@ class TestFixture extends TestSetupWithVmAndValidators {
         blockchainWriter,
         storagesInstance.storages.evmCodeStorage,
         blockchainConfig,
-        consensus.blockPreparator,
-        new BlockValidation(consensus, blockchainReader, blockQueue)
+        mining.blockPreparator,
+        new BlockValidation(mining, blockchainReader, blockQueue)
       ) {
         override def executeAndValidateBlock(
             block: Block,

src/it/scala/io/iohk/ethereum/sync/util/RegularSyncItSpecUtils.scala

@@ -26,13 +26,13 @@ import io.iohk.ethereum.blockchain.sync.regular.BlockImporter.Start
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync.NewCheckpoint
 import io.iohk.ethereum.checkpointing.CheckpointingTestHelpers
-import io.iohk.ethereum.consensus.ConsensusConfig
-import io.iohk.ethereum.consensus.FullConsensusConfig
-import io.iohk.ethereum.consensus.Protocol.NoAdditionalPoWData
 import io.iohk.ethereum.consensus.blocks.CheckpointBlockGenerator
+import io.iohk.ethereum.consensus.mining.FullMiningConfig
+import io.iohk.ethereum.consensus.mining.MiningConfig
+import io.iohk.ethereum.consensus.mining.Protocol.NoAdditionalPoWData
 import io.iohk.ethereum.consensus.pow
 import io.iohk.ethereum.consensus.pow.EthashConfig
-import io.iohk.ethereum.consensus.pow.PoWConsensus
+import io.iohk.ethereum.consensus.pow.PoWMining
 import io.iohk.ethereum.consensus.pow.validators.ValidatorsExecutor
 import io.iohk.ethereum.crypto
 import io.iohk.ethereum.domain._
@@ -46,6 +46,7 @@ import io.iohk.ethereum.sync.util.SyncCommonItSpecUtils.FakePeerCustomConfig.def
 import io.iohk.ethereum.sync.util.SyncCommonItSpecUtils._
 import io.iohk.ethereum.transactions.PendingTransactionsManager
 import io.iohk.ethereum.utils._
+
 object RegularSyncItSpecUtils {
 
   class ValidatorsExecutorAlwaysSucceed extends MockValidatorsAlwaysSucceed {
@@ -62,13 +63,13 @@ object RegularSyncItSpecUtils {
   class FakePeer(peerName: String, fakePeerCustomConfig: FakePeerCustomConfig)
       extends CommonFakePeer(peerName, fakePeerCustomConfig) {
 
-    def buildEthashConsensus(): pow.PoWConsensus = {
-      val consensusConfig: ConsensusConfig = ConsensusConfig(Config.config)
+    def buildEthashMining(): pow.PoWMining = {
+      val miningConfig: MiningConfig = MiningConfig(Config.config)
       val specificConfig: EthashConfig = pow.EthashConfig(config)
-      val fullConfig = FullConsensusConfig(consensusConfig, specificConfig)
+      val fullConfig = FullMiningConfig(miningConfig, specificConfig)
       val vm = VmSetup.vm(VmConfig(config), blockchainConfig, testMode = false)
-      val consensus =
-        PoWConsensus(
+      val mining =
+        PoWMining(
           vm,
           storagesInstance.storages.evmCodeStorage,
           bl,
@@ -78,7 +79,7 @@ object RegularSyncItSpecUtils {
           ValidatorsExecutorAlwaysSucceed,
           NoAdditionalPoWData
         )
-      consensus
+      mining
     }
 
     lazy val checkpointBlockGenerator: CheckpointBlockGenerator = new CheckpointBlockGenerator
@@ -88,18 +89,18 @@ object RegularSyncItSpecUtils {
         "peers-client"
       )
 
-    lazy val consensus: PoWConsensus = buildEthashConsensus()
+    lazy val mining: PoWMining = buildEthashMining()
 
     lazy val blockQueue: BlockQueue = BlockQueue(bl, blockchainReader, syncConfig)
-    lazy val blockValidation = new BlockValidation(consensus, blockchainReader, blockQueue)
+    lazy val blockValidation = new BlockValidation(mining, blockchainReader, blockQueue)
     lazy val blockExecution =
       new BlockExecution(
         bl,
         blockchainReader,
         blockchainWriter,
         storagesInstance.storages.evmCodeStorage,
         blockchainConfig,
-        consensus.blockPreparator,
+        mining.blockPreparator,
         blockValidation
       )
     lazy val blockImport: BlockImport =
@@ -120,7 +121,7 @@ object RegularSyncItSpecUtils {
       "pending-transactions-manager"
     )
 
-    lazy val validators: ValidatorsExecutor = buildEthashConsensus().validators
+    lazy val validators: ValidatorsExecutor = buildEthashMining().validators
 
     val broadcasterRef: ActorRef = system.actorOf(
       BlockBroadcasterActor

src/it/scala/io/iohk/ethereum/txExecTest/ContractTest.scala

@@ -22,15 +22,15 @@ class ContractTest extends AnyFlatSpec with Matchers {
 
     //block only with ether transfers
     val blockValidation =
-      new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
+      new BlockValidation(mining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
     val blockExecution =
       new BlockExecution(
         blockchain,
         blockchainReader,
         blockchainWriter,
         testBlockchainStorages.evmCodeStorage,
         blockchainConfig,
-        consensus.blockPreparator,
+        mining.blockPreparator,
         blockValidation
       )
     blockExecution.executeAndValidateBlock(fixtures.blockByNumber(1)) shouldBe noErrors

src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala

@@ -84,15 +84,15 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
       val blockchainWriter = BlockchainWriter(storages, blockchainMetadata)
       val blockchain = BlockchainImpl(storages, blockchainReader, blockchainMetadata)
       val blockValidation =
-        new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
+        new BlockValidation(mining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
       val blockExecution =
         new BlockExecution(
           blockchain,
           blockchainReader,
           blockchainWriter,
           testBlockchainStorages.evmCodeStorage,
           blockchainConfig,
-          consensus.blockPreparator,
+          mining.blockPreparator,
           blockValidation
         )
       blockExecution.executeAndValidateBlock(fixtures.blockByNumber(blockToExecute)) shouldBe noErrors

src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala

@@ -77,15 +77,15 @@ class ForksTest extends AnyFlatSpec with Matchers {
       val blockchainWriter = BlockchainWriter(storages, blockchainMetadata)
       val blockchain = BlockchainImpl(storages, blockchainReader, blockchainMetadata)
       val blockValidation =
-        new BlockValidation(consensus, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
+        new BlockValidation(mining, blockchainReader, BlockQueue(blockchain, blockchainReader, syncConfig))
       val blockExecution =
         new BlockExecution(
           blockchain,
           blockchainReader,
           blockchainWriter,
           testBlockchainStorages.evmCodeStorage,
           blockchainConfig,
-          consensus.blockPreparator,
+          mining.blockPreparator,
           blockValidation
         )
       blockExecution.executeAndValidateBlock(fixtures.blockByNumber(blockToExecute)) shouldBe noErrors

src/main/resources/conf/base-testnet.conf

@@ -15,7 +15,7 @@ mantis {
     mode = "archive"
   }
 
-  consensus {
+  mining {
     coinbase = "0011223344556677889900112233445566778899" # has to be changed for each node
     mining-enabled = false
     protocol = "restricted-pow"

src/main/resources/conf/base.conf

@@ -273,7 +273,7 @@ mantis {
     get-transaction-from-pool-timeout = 5.seconds
   }
 
-  consensus {
+  mining {
     # Miner's coinbase address
     # Also used in non-Ethash consensus.
     coinbase = "0011223344556677889900112233445566778899"
@@ -287,7 +287,7 @@ mantis {
     # Also used by the generic `BlockGenerator`.
     block-cashe-size = 30
 
-    # See io.iohk.ethereum.consensus.Protocol for the available protocols.
+    # See io.iohk.ethereum.consensus.mining.Protocol for the available protocols.
     # Declaring the protocol here means that a more protocol-specific configuration
     # is pulled from the corresponding consensus implementation.
     # For example, in case of ethash, a section named `ethash` is used.

src/main/resources/conf/pottery.conf

@@ -11,7 +11,7 @@ mantis {
     }
   }
 
-	consensus {
+	mining {
     coinbase = "0011223344556677889900112233445566778899" # has to be changed for each node
     mining-enabled = true
     protocol = "restricted-pow"