[Chore] Remove unused iodb (#658)

Author: mirkoAlic

build.sbt

@@ -27,7 +27,6 @@ val dep = {
     "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "it,test",
     "io.suzaku" %% "boopickle" % "1.3.0",
     "org.ethereum" % "rocksdbjni" % rocksDb,
-    "org.scorexfoundation" %% "iodb" % "0.3.0",
     "org.scalatest" %% "scalatest" % "3.0.5" % "it,test",
     "org.scalamock" %% "scalamock-scalatest-support" % "3.6.0" % "test",
     "org.scalacheck" %% "scalacheck" % "1.14.0" % "it,test",
@@ -45,8 +44,8 @@ val dep = {
     "org.bouncycastle" % "bcprov-jdk15on" % "1.59",
     "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",
     "org.typelevel" %% "mouse" % "0.18",
-
     "com.twitter" %% "util-collection" % "18.5.0",
+    "com.google.guava" % "guava" % "28.0-jre",
 
     // mallet deps
     "org.jline" % "jline" % "3.1.2",

src/it/scala/io/iohk/ethereum/db/DataSourceIntegrationTestBehavior.scala

@@ -142,7 +142,7 @@ trait DataSourceIntegrationTestBehavior
           val db = createDataSource(path).update(namespace = OtherNamespace, toRemove = Seq(), toUpsert = keyList.zip(keyList))
           db.destroy()
 
-          assert(!new File("/tmp/iodbDestroy").exists())
+          assert(!new File(path).exists())
 
           val dbAfterDestroy = createDataSource(path)
           keyList.foreach { key => assert(dbAfterDestroy.get(OtherNamespace, key).isEmpty) }

src/it/scala/io/iohk/ethereum/db/IodbDataSourceIntegrationSuite.scala

@@ -442,11 +442,6 @@ mantis {
   }
 
   db {
-    # IODB database is not currently used
-    iodb {
-      path = ${mantis.datadir}"/iodb/"
-    }
-
     rocksdb {
       # RocksDB data directory
       path = ${mantis.datadir}"/rocksdb/"
@@ -477,7 +472,7 @@ mantis {
       block-cache-size = 33554432
     }
 
-    # Define which database to use [rocksdb], iodb is not currently used
+    # Define which database to use [rocksdb]
     data-source = "rocksdb"
   }
 

src/main/resources/application.conf

@@ -55,50 +55,4 @@ object Storages {
 
     }
   }
-
-  /**
-    * As IODB required same length keys, we need a specific storage that pads integer values to be used as keys to match
-    * keccak keys. See [[io.iohk.ethereum.db.storage.IodbBlockNumberMappingStorage]]
-    */
-  trait IodbStorages extends StoragesComponent {
-    dataSourcesComp: DataSourcesComponent with PruningModeComponent =>
-
-    override val storages = new DefaultBlockchainStorages(pruningMode)
-
-    class DefaultBlockchainStorages(override val pruningMode: PruningMode) extends Storages with AppCaches {
-
-      override val blockHeadersStorage: BlockHeadersStorage = new BlockHeadersStorage(dataSources.blockHeadersDataSource)
-
-      override val blockBodiesStorage: BlockBodiesStorage = new BlockBodiesStorage(dataSources.blockBodiesDataSource)
-
-      override val blockNumberMappingStorage: BlockNumberMappingStorage = new IodbBlockNumberMappingStorage(dataSources.blockHeightsHashesDataSource)
-
-      override val receiptStorage: ReceiptStorage = new ReceiptStorage(dataSources.receiptsDataSource)
-
-      override val nodeStorage: NodeStorage = new NodeStorage(dataSources.mptDataSource)
-
-      override val cachedNodeStorage: CachedNodeStorage = new CachedNodeStorage(nodeStorage, caches.nodeCache)
-
-      override val fastSyncStateStorage: FastSyncStateStorage = new FastSyncStateStorage(dataSources.fastSyncStateDataSource)
-
-      override val evmCodeStorage: EvmCodeStorage = new EvmCodeStorage(dataSources.evmCodeDataSource)
-
-      override val totalDifficultyStorage: TotalDifficultyStorage =
-        new TotalDifficultyStorage(dataSources.totalDifficultyDataSource)
-
-      override val appStateStorage: AppStateStorage = new AppStateStorage(dataSources.appStateDataSource)
-
-      override val transactionMappingStorage: TransactionMappingStorage = new TransactionMappingStorage(dataSources.transactionMappingDataSource)
-
-      override val knownNodesStorage: KnownNodesStorage = new KnownNodesStorage(dataSources.knownNodesDataSource)
-
-      override val stateStorage: StateStorage =
-        StateStorage(
-          pruningMode,
-          nodeStorage,
-          cachedNodeStorage,
-          new LruCache[NodeHash, HeapEntry](Config.InMemoryPruningNodeCacheConfig, Some(CachedReferenceCountedStorage.saveOnlyNotificationHandler(nodeStorage)))
-        )
-    }
-  }
 }

src/main/scala/io/iohk/ethereum/db/components/SharedIodbDataSources.scala

@@ -182,15 +182,10 @@ object Config {
   object Db {
 
     private val dbConfig = config.getConfig("db")
-    private val iodbConfig = dbConfig.getConfig("iodb")
     private val rocksDbConfig = dbConfig.getConfig("rocksdb")
 
     val dataSource: String = dbConfig.getString("data-source")
 
-    object Iodb  {
-      val path: String = iodbConfig.getString("path")
-    }
-
     object RocksDb extends RocksDbConfig {
       override val createIfMissing: Boolean = rocksDbConfig.getBoolean("create-if-missing")
       override val paranoidChecks: Boolean = rocksDbConfig.getBoolean("paranoid-checks")

src/main/scala/io/iohk/ethereum/db/components/Storages.scala

@@ -15,7 +15,7 @@ snappy {
   # Path to the DB snapshot that contains all the blocks to be executed (and state for single-db)
   source-db-path = "path/to/source-db"
 
-  # Data source that should be used [rocksdb], iodb is not currently used
+  # Data source that should be used [rocksdb]
   data-source = "rocksdb"
 
   # Path to the DB where the state resulting from execution is saved (for single-db this is ignored)

src/main/scala/io/iohk/ethereum/db/dataSource/IodbDataSource.scala

@@ -30,8 +30,6 @@ verifyDependencies in verify ++= Seq(
   "org.scala-lang.modules" % "scala-parser-combinators" sha1 "bbce493f8bf61b56623624ff96ac3865f7f6999a",
   "io.suzaku" % "boopickle" sha1 "a1cd66dfb24325d11cb38c340b7663e1ee4ed70e",
   "org.ethereum" % "rocksdbjni" sha1 "63e2b8b137c967ec15049f1f66b9d987e8f4beb7",
-  "org.scorexfoundation" % "iodb" sha1 "0d4b86fe17008bfc5ec0fe4317d6d9c39a81dc85",
-  "net.jpountz.lz4" % "lz4" sha1 "c708bb2590c0652a642236ef45d9f99ff842a2ce",
   "ch.qos.logback" % "logback-classic" sha1 "7c4f3c474fb2c041d8028740440937705ebb473a",
   "ch.qos.logback" % "logback-core" sha1 "864344400c3d4d92dfeb0a305dc87d953677c03c",
   "org.jline" % "jline" sha1 "dfb4e9e15e981634155ce063fa697b2b8964d507",
@@ -59,7 +57,15 @@ verifyDependencies in verify ++= Seq(
   "com.twitter" % "util-collection" sha1 "8c62e0dc1a7bccd094ea3cfed23fe67ddd3a5590",
   "com.twitter" % "util-core" sha1 "ff2e5929ac0e26d1c8cfac00384707e8c6accb01",
   "com.twitter" % "util-function" sha1 "2b24ea268e08431eec442a510bf2a05f1d5a1a3b",
-  "com.google.guava" % "guava" sha1 "6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9",
+  "com.google.guava" % "guava" sha1 "54fed371b4b8a8cce1e94a9abd9620982d3aa54b",
+  "com.google.guava" % "failureaccess" sha1 "1dcf1de382a0bf95a3d8b0849546c88bac1292c9",
+  "com.google.guava" % "listenablefuture" sha1 "b421526c5f297295adef1c886e5246c39d4ac629",
+  "com.google.code.findbugs" % "jsr305" sha1 "25ea2e8b0c338a877313bd4672d3fe056ea78f0d",
+  "org.checkerframework" % "checker-qual" sha1 "eb2e8ab75598548cc8acf9a1ca227e480e01881e",
+  "com.google.errorprone" % "error_prone_annotations" sha1 "d1a0c5032570e0f64be6b4d9c90cdeb103129029",
+  "com.google.j2objc" % "j2objc-annotations" sha1 "ba035118bc8bac37d7eff77700720999acd9986d",
+  "org.codehaus.mojo" % "animal-sniffer-annotations" sha1 "f97ce6decaea32b36101e37979f8b647f00681fb",
+
   "com.github.scopt" % "scopt" sha1 "e078455e1a65597146f8608dab3247bf1eb92e6e",
   "com.datadoghq" % "java-dogstatsd-client" sha1 "a9380127a42855a76af7787840a3a04b9fc4ce20",
   "org.xerial.snappy" % "snappy-java" sha1 "307b286efd119ad2c6d4291128bf110bddc68088"