2020 11 02 cleanup (#2233)

* Cleanup a bunch of imports in test * Use @nowarn annotation for testing things that are deprecated * Fix base58 test * Cleanup crypto-test * Use scala collection compat dependency to get access to the @nowarn annotation on scala 2.12.x * Rework more scala 2.13.x compile failures in chain-test and key-manager-test * Optimize imports for entire project * Fix nits
bitcoin-s · Nov 3, 2020 · 8a14835 · 8a14835
1 parent 6415384
commit 8a14835
Show file tree

Hide file tree

Showing 144 changed files with 336 additions and 482 deletions.
diff --git a/app/gui/src/main/scala/org/bitcoins/gui/TaskRunner.scala b/app/gui/src/main/scala/org/bitcoins/gui/TaskRunner.scala
@@ -2,8 +2,8 @@ package org.bitcoins.gui
 
 import scalafx.application.Platform
 import scalafx.scene.Node
-import scalafx.scene.control.Alert.AlertType
 import scalafx.scene.control.Alert
+import scalafx.scene.control.Alert.AlertType
 
 /**
   * Runs a background task disabling the `mainView` and main visible `glassPane`.

diff --git a/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCPaneModel.scala b/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCPaneModel.scala
@@ -3,8 +3,8 @@ package org.bitcoins.gui.dlc
 import org.bitcoins.cli.{CliCommand, ConsoleCli}
 import org.bitcoins.commons.jsonmodels.dlc.DLCMessage.OracleInfo
 import org.bitcoins.crypto.ECPrivateKey
-import org.bitcoins.gui.{GlobalData, TaskRunner}
 import org.bitcoins.gui.dlc.dialog._
+import org.bitcoins.gui.{GlobalData, TaskRunner}
 import scalafx.beans.property.ObjectProperty
 import scalafx.scene.control.{TextArea, TextField}
 import scalafx.stage.Window

diff --git a/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/PunishDLCDialog.scala b/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/PunishDLCDialog.scala
@@ -1,8 +1,8 @@
 package org.bitcoins.gui.dlc.dialog
 
 import org.bitcoins.cli.CliCommand.ClaimDLCPenaltyFunds
-import org.bitcoins.crypto.Sha256DigestBE
 import org.bitcoins.core.protocol.transaction.Transaction
+import org.bitcoins.crypto.Sha256DigestBE
 import scalafx.scene.control.TextField
 
 object PunishDLCDialog

diff --git a/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala b/app/server-test/src/test/scala/org/bitcoins/server/RoutesSpec.scala
@@ -7,15 +7,8 @@ import akka.http.scaladsl.server.ValidationRejection
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.bitcoins.core.Core
 import org.bitcoins.core.api.chain.ChainApi
+import org.bitcoins.core.api.wallet.db._
 import org.bitcoins.core.api.wallet.{AddressInfo, CoinSelectionAlgo}
-import org.bitcoins.core.api.wallet.db.{
-  AccountDb,
-  AddressDb,
-  AddressTagDb,
-  LegacyAddressDb,
-  SegwitV0SpendingInfo,
-  SpendingInfoDb
-}
 import org.bitcoins.core.config.RegTest
 import org.bitcoins.core.crypto.ExtPublicKey
 import org.bitcoins.core.currency.{Bitcoins, CurrencyUnit, Satoshis}

diff --git a/app/server/src/main/scala/de/heikoseeberger/akkahttpupickle/UpickleSupport.scala b/app/server/src/main/scala/de/heikoseeberger/akkahttpupickle/UpickleSupport.scala
@@ -17,12 +17,12 @@
 package de.heikoseeberger.akkahttpupickle
 
 import akka.http.scaladsl.marshalling.{Marshaller, ToEntityMarshaller}
-import akka.http.scaladsl.model.ContentTypeRange
-import akka.http.scaladsl.model.MediaType
+import akka.http.scaladsl.model.{ContentTypeRange, MediaType}
 import akka.http.scaladsl.model.MediaTypes.`application/json`
 import akka.http.scaladsl.unmarshalling.{FromEntityUnmarshaller, Unmarshaller}
 import akka.util.ByteString
 import upickle.default.{read, write, Reader, Writer}
+
 import scala.collection.immutable.Seq
 
 /**

diff --git a/bench/src/main/scala/org/bitcoins/bench/eclair/EclairBench.scala b/bench/src/main/scala/org/bitcoins/bench/eclair/EclairBench.scala
@@ -9,8 +9,8 @@ import org.bitcoins.core.protocol.ln.currency._
 import org.bitcoins.testkit.async.TestAsyncUtil
 import org.bitcoins.testkit.eclair.rpc.EclairRpcTestUtil
 
-import scala.concurrent.duration.DurationInt
 import scala.concurrent.Future
+import scala.concurrent.duration.DurationInt
 import scala.util.{Failure, Success}
 
 /**

diff --git a/bench/src/main/scala/org/bitcoins/bench/eclair/PaymentLog.scala b/bench/src/main/scala/org/bitcoins/bench/eclair/PaymentLog.scala
@@ -9,8 +9,9 @@ import org.bitcoins.commons.jsonmodels.eclair.WebSocketEvent.{
   PaymentSent
 }
 import org.bitcoins.commons.jsonmodels.eclair.{PaymentId, WebSocketEvent}
-import org.bitcoins.crypto.Sha256Digest
 import org.bitcoins.core.seqUtil
+import org.bitcoins.crypto.Sha256Digest
+
 import scala.concurrent.Promise
 
 object PaymentLog {

diff --git a/chain-test/src/test/scala/org/bitcoins/chain/blockchain/BitcoindChainHandlerViaZmqTest.scala b/chain-test/src/test/scala/org/bitcoins/chain/blockchain/BitcoindChainHandlerViaZmqTest.scala
@@ -26,7 +26,8 @@ class BitcoindChainHandlerViaZmqTest extends ChainDbUnitTest {
 
       for {
         _ <-
-          chainHandler.getBlockCount
+          chainHandler
+            .getBlockCount()
             .map(count => assert(count == 0))
         address <- bitcoind.getNewAddress
         hash +: _ <- bitcoind.generateToAddress(1, address)

diff --git a/chain-test/src/test/scala/org/bitcoins/chain/blockchain/ChainHandlerTest.scala b/chain-test/src/test/scala/org/bitcoins/chain/blockchain/ChainHandlerTest.scala
@@ -10,22 +10,21 @@ import org.bitcoins.core.number.{Int32, UInt32}
 import org.bitcoins.core.p2p.CompactFilterMessage
 import org.bitcoins.core.protocol.BlockStamp
 import org.bitcoins.core.protocol.blockchain.BlockHeader
-import org.bitcoins.core.util.{FutureUtil, TimeUtil}
+import org.bitcoins.core.util.TimeUtil
 import org.bitcoins.crypto.{
   DoubleSha256Digest,
   DoubleSha256DigestBE,
   ECPrivateKey
 }
-import org.bitcoins.testkit.chain
 import org.bitcoins.testkit.chain.fixture.ChainFixtureTag
 import org.bitcoins.testkit.chain.{
   BlockHeaderHelper,
   ChainDbUnitTest,
   ChainTestUtil,
   ChainUnitTest
 }
-import org.bitcoins.testkit.util.{FileUtil, ScalaTestUtil}
-import org.scalatest.{Assertion, FutureOutcome}
+import org.bitcoins.testkit.util.FileUtil
+import org.scalatest.FutureOutcome
 import play.api.libs.json.Json
 
 import scala.concurrent.{Future, Promise}
@@ -87,7 +86,7 @@ class ChainHandlerTest extends ChainDbUnitTest {
 
   it must "have an in-order seed" in { _ =>
     val source = FileUtil.getFileAsSource("block_headers.json")
-    val arrStr = source.getLines.next
+    val arrStr = source.getLines().next()
     source.close()
 
     import org.bitcoins.commons.serializers.JsonReaders.BlockHeaderReads
@@ -129,7 +128,7 @@ class ChainHandlerTest extends ChainDbUnitTest {
       val assertBBestHashF = for {
         chainHandler <- chainHandlerCF
         headerB <- newHeaderBF
-        bestHash <- chainHandler.getBestBlockHash
+        bestHash <- chainHandler.getBestBlockHash()
       } yield {
         assert(bestHash == headerB.hashBE)
       }
@@ -218,14 +217,14 @@ class ChainHandlerTest extends ChainDbUnitTest {
       for {
         chainHandlerF <- chainHandlerFF
         headerE <- headerEF
-        bestHash <- chainHandlerF.getBestBlockHash
+        bestHash <- chainHandlerF.getBestBlockHash()
       } yield assert(bestHash == headerE.hashBE)
   }
 
   it must "get the highest filter header" in { chainHandler: ChainHandler =>
     {
       for {
-        count <- chainHandler.getFilterHeaderCount
+        count <- chainHandler.getFilterHeaderCount()
         genesisFilterHeader <- chainHandler.getFilterHeadersAtHeight(count)
       } yield {
         assert(genesisFilterHeader.size == 1)
@@ -255,7 +254,7 @@ class ChainHandlerTest extends ChainDbUnitTest {
   it must "get the highest filter" in { chainHandler: ChainHandler =>
     {
       for {
-        count <- chainHandler.getFilterCount
+        count <- chainHandler.getFilterCount()
         genesisFilter <- chainHandler.getFiltersAtHeight(count)
       } yield {
         assert(count == 0)
@@ -382,7 +381,6 @@ class ChainHandlerTest extends ChainDbUnitTest {
         blockHeaderBatchOpt <- chainHandler.nextBlockHeaderBatchRange(
           prevStopHash = ChainTestUtil.regTestGenesisHeaderDb.hashBE,
           batchSize = batchSize)
-        count <- chainHandler.getBlockCount()
       } yield {
         assert(blockHeaderBatchOpt.isDefined)
         val marker = blockHeaderBatchOpt.get
@@ -420,7 +418,6 @@ class ChainHandlerTest extends ChainDbUnitTest {
       val assert1F = for {
         rangeOpt <-
           chainHandler.nextBlockHeaderBatchRange(genesisHeader.hashBE, 1)
-        count <- chainHandler.getBlockCount()
       } yield {
         assert(rangeOpt.isEmpty)
       }

diff --git a/chain-test/src/test/scala/org/bitcoins/chain/blockchain/MainnetChainHandlerTest.scala b/chain-test/src/test/scala/org/bitcoins/chain/blockchain/MainnetChainHandlerTest.scala
@@ -26,7 +26,7 @@ class MainnetChainHandlerTest extends ChainDbUnitTest {
   implicit override lazy val appConfig: ChainAppConfig = mainnetAppConfig
 
   val source: BufferedSource = FileUtil.getFileAsSource("block_headers.json")
-  val arrStr: String = source.getLines.next
+  val arrStr: String = source.getLines().next()
   source.close()
 
   import org.bitcoins.commons.serializers.JsonReaders.BlockHeaderReads
@@ -92,7 +92,7 @@ class MainnetChainHandlerTest extends ChainDbUnitTest {
 
         for {
           ch <- processedF
-          bestHash <- ch.getBestBlockHash
+          bestHash <- ch.getBestBlockHash()
         } yield assert(bestHash == blockHeadersToTest.last.hashBE)
       }
   }

diff --git a/chain-test/src/test/scala/org/bitcoins/chain/blockchain/sync/ChainSyncTest.scala b/chain-test/src/test/scala/org/bitcoins/chain/blockchain/sync/ChainSyncTest.scala
@@ -41,7 +41,7 @@ class ChainSyncTest extends ChainDbUnitTest {
       }
 
       newChainHandlerF.flatMap { chainHandler =>
-        chainHandler.getBlockCount.map(count => assert(count == 1))
+        chainHandler.getBlockCount().map(count => assert(count == 1))
 
       }
   }
@@ -66,7 +66,7 @@ class ChainSyncTest extends ChainDbUnitTest {
                        getBestBlockHashFunc = getBestBlockHashFunc)
 
       newChainHandlerF.flatMap { chainHandler =>
-        chainHandler.getBlockCount.map(count => assert(count == 0))
+        chainHandler.getBlockCount().map(count => assert(count == 0))
       }
   }
 

diff --git a/chain-test/src/test/scala/org/bitcoins/chain/blockchain/sync/FilterSyncTest.scala b/chain-test/src/test/scala/org/bitcoins/chain/blockchain/sync/FilterSyncTest.scala
@@ -23,8 +23,8 @@ class FilterSyncTest extends ChainDbUnitTest {
   it must "sync 1 filter header from an external data source" in { fixture =>
     val BitcoindV19ChainHandler(bitcoind, chainHandler) = fixture
 
-    val initFilterCountF = chainHandler.getFilterCount
-    val initFilterHeaderCountF = chainHandler.getFilterHeaderCount
+    val initFilterCountF = chainHandler.getFilterCount()
+    val initFilterHeaderCountF = chainHandler.getFilterHeaderCount()
     val initAssertionsF = for {
       initFilterCount <- initFilterCountF
       initFilterHeaderCount <- initFilterHeaderCountF

diff --git a/chain-test/src/test/scala/org/bitcoins/chain/models/CompactFilterHeaderDAOTest.scala b/chain-test/src/test/scala/org/bitcoins/chain/models/CompactFilterHeaderDAOTest.scala
@@ -1,17 +1,12 @@
 package org.bitcoins.chain.models
 
 import org.bitcoins.core.api.chain.db.{BlockHeaderDb, CompactFilterHeaderDb}
-import org.bitcoins.core.protocol.blockchain.BlockHeader
 import org.bitcoins.testkit.chain.{
   BlockHeaderHelper,
   ChainDbUnitTest,
-  ChainTestUtil,
-  ChainUnitTest
-}
-import org.bitcoins.testkit.core.gen.{
-  BlockchainElementsGenerator,
-  CryptoGenerators
+  ChainTestUtil
 }
+import org.bitcoins.testkit.core.gen.CryptoGenerators
 import org.scalatest.FutureOutcome
 
 class CompactFilterHeaderDAOTest extends ChainDbUnitTest {

diff --git a/chain/src/main/scala/org/bitcoins/chain/blockchain/ChainHandler.scala b/chain/src/main/scala/org/bitcoins/chain/blockchain/ChainHandler.scala
@@ -4,9 +4,9 @@ import org.bitcoins.chain.ChainVerificationLogger
 import org.bitcoins.chain.config.ChainAppConfig
 import org.bitcoins.chain.models._
 import org.bitcoins.chain.pow.Pow
-import org.bitcoins.core.api.chain.{ChainApi, FilterSyncMarker}
 import org.bitcoins.core.api.chain.ChainQueryApi.FilterResponse
 import org.bitcoins.core.api.chain.db._
+import org.bitcoins.core.api.chain.{ChainApi, FilterSyncMarker}
 import org.bitcoins.core.gcs.FilterHeader
 import org.bitcoins.core.number.UInt32
 import org.bitcoins.core.p2p.CompactFilterMessage

diff --git a/core-test/src/test/scala/org/bitcoins/core/api/CallbackTest.scala b/core-test/src/test/scala/org/bitcoins/core/api/CallbackTest.scala
@@ -17,7 +17,8 @@ class CallbackTest extends BitcoinSAsyncTest {
     val f1: Callback[Unit] = _ => {
       system.scheduler.scheduleOnce(testTimeout) {
         if (!promise.isCompleted) {
-          promise.complete(fail("2nd callback did not start before timeout"))
+          promise.failure(
+            new RuntimeException("2nd callback did not start before timeout"))
         }
       }
       promise.future.map(_ => ())

diff --git a/core-test/src/test/scala/org/bitcoins/core/bloom/BloomFilterTest.scala b/core-test/src/test/scala/org/bitcoins/core/bloom/BloomFilterTest.scala
@@ -4,18 +4,12 @@ import org.bitcoins.core.crypto._
 import org.bitcoins.core.number.UInt32
 import org.bitcoins.core.protocol.blockchain.Block
 import org.bitcoins.core.protocol.transaction.{Transaction, TransactionOutPoint}
-import org.bitcoins.crypto.{
-  CryptoUtil,
-  DoubleSha256Digest,
-  ECPrivateKey,
-  ECPublicKey,
-  Sha256Hash160Digest
-}
-import scodec.bits._
+import org.bitcoins.crypto._
+import org.bitcoins.testkit.core.gen.BloomFilterGenerator
 import org.bitcoins.testkit.util.BitcoinSUnitTest
+import scodec.bits._
 
 import scala.util.Try
-import org.bitcoins.testkit.core.gen.BloomFilterGenerator
 
 class BloomFilterTest extends BitcoinSUnitTest {
   "BloomFilter" must "create a bloom filter, insert a few elements, then serialize and deserialize it" in {

diff --git a/core-test/src/test/scala/org/bitcoins/core/compat/CompatEitherTest.scala b/core-test/src/test/scala/org/bitcoins/core/compat/CompatEitherTest.scala
@@ -1,8 +1,8 @@
 package org.bitcoins.core.compat
 
-import org.bitcoins.chain.blockchain.BlockchainUpdate.Successful
 import org.bitcoins.testkit.util.BitcoinSUnitTest
 
+import scala.annotation.nowarn
 import scala.util.{Failure, Success}
 
 class CompatEitherTest extends BitcoinSUnitTest {
@@ -24,29 +24,29 @@ class CompatEitherTest extends BitcoinSUnitTest {
   it should "do traverse operations" in {
     val mappedRight = CompatEither(Right(12)).map(_ => "flower")
     assert(mappedRight == CompatEither(Right("flower")))
-    val mappedLeft = CompatEither(Left(12)).map(_ => "flower")
+    @nowarn val mappedLeft = CompatEither(Left(12)).map(_ => "flower")
     assert(mappedLeft == CompatEither(Left(12)))
 
     val flatmappedRight: CompatEither[Int, String] =
       CompatEither(Right(12)).flatMap(_ => CompatEither(Right("flower")))
     assert(flatmappedRight == CompatRight("flower"))
-    val flatmappedLeft =
+    @nowarn val flatmappedLeft =
       CompatEither(Left(12)).flatMap(_ => CompatEither(Left("21")))
     assert(flatmappedLeft == CompatLeft(12))
 
-    val foldedRight = CompatEither(Right(12)).fold({ _ =>
-                                                     "left"
-                                                   },
-                                                   { _ =>
-                                                     "right"
-                                                   })
+    @nowarn val foldedRight = CompatEither(Right(12)).fold({ _ =>
+                                                             "left"
+                                                           },
+                                                           { _ =>
+                                                             "right"
+                                                           })
     assert(foldedRight == "right")
-    val foldedLeft = CompatEither(Left(12)).fold({ _ =>
-                                                   "left"
-                                                 },
-                                                 { _ =>
-                                                   "right"
-                                                 })
+    @nowarn val foldedLeft = CompatEither(Left(12)).fold({ _ =>
+                                                           "left"
+                                                         },
+                                                         { _ =>
+                                                           "right"
+                                                         })
     assert(foldedLeft == "left")
   }
 

diff --git a/core-test/src/test/scala/org/bitcoins/core/crypto/ChainCodeTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/ChainCodeTest.scala
@@ -1,7 +1,7 @@
 package org.bitcoins.core.crypto
 
-import org.bitcoins.testkit.util.BitcoinSUnitTest
 import org.bitcoins.testkit.core.gen.NumberGenerator
+import org.bitcoins.testkit.util.BitcoinSUnitTest
 
 class ChainCodeTest extends BitcoinSUnitTest {
   behavior of "ChainCode"

diff --git a/core-test/src/test/scala/org/bitcoins/core/crypto/ExtKeySpec.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/ExtKeySpec.scala
@@ -1,10 +1,9 @@
 package org.bitcoins.core.crypto
 
-import org.bitcoins.testkit.core.gen.CryptoGenerators
 import org.bitcoins.core.number.UInt32
-import org.bitcoins.core.util.BitcoinSLogger
+import org.bitcoins.testkit.core.gen.CryptoGenerators
 import org.bitcoins.testkit.util.BitcoinSUnitTest
-import org.scalacheck.{Gen, Prop, Properties}
+import org.scalacheck.{Gen, Prop}
 
 import scala.util.Success
 

diff --git a/core-test/src/test/scala/org/bitcoins/core/crypto/ExtKeyTest.scala b/core-test/src/test/scala/org/bitcoins/core/crypto/ExtKeyTest.scala
@@ -35,7 +35,7 @@ class ExtKeyTest extends BitcoinSUnitTest {
           case (Success(_), Success(_)) => succeed
           case (Failure(exc1), Failure(exc2)) =>
             assert(exc1.getMessage == exc2.getMessage)
-          case _: (Try[ExtPublicKey], Try[ExtPublicKey]) => fail
+          case _: (Try[ExtPublicKey], Try[ExtPublicKey]) => fail()
         }
     }
   }
@@ -44,7 +44,7 @@ class ExtKeyTest extends BitcoinSUnitTest {
     forAll(CryptoGenerators.extPublicKey) { pub =>
       val attempt = ExtPrivateKey.fromStringT(pub.toString)
       attempt match {
-        case Success(_)   => fail
+        case Success(_)   => fail()
         case Failure(exc) => assert(exc.getMessage.contains("expected private"))
       }
     }
@@ -75,7 +75,7 @@ class ExtKeyTest extends BitcoinSUnitTest {
         val pub = priv.extPublicKey
         val derivedPub = pub.deriveChildPubKey(child.toUInt32)
         derivedPub match {
-          case Success(_)   => fail
+          case Success(_)   => fail()
           case Failure(exc) => assert(exc.getMessage.contains("hardened"))
         }
     }