Revert "Dependency updates (#182)"

This reverts commit 1a03cce.
Topl · May 7, 2024 · 61b14c8 · 61b14c8
1 parent 1a03cce
commit 61b14c8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 49 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -9,6 +9,3 @@ dd7657b6c4b7470e3aeb24694c04eed00965351f
 
 # Scala Steward: Reformat with scalafmt 3.8.0
 59ba791143d3646f8756ed5449236a61126cf004
-
-# Scala Steward: Reformat with scalafmt 3.8.1
-9c004a429f82c2554bb5952069e198a717dd283f
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.1"
+version = "3.8.0"
 
 runner.dialect = scala213
 

diff --git a/integration/src/test/scala/co/topl/brambl/monitoring/BitcoinMonitorTest.scala b/integration/src/test/scala/co/topl/brambl/monitoring/BitcoinMonitorTest.scala
@@ -11,67 +11,53 @@ import scala.concurrent.duration.DurationInt
 class BitcoinMonitorTest extends munit.CatsEffectSuite {
   val TestWallet = "test"
   val NumBlocks = 5
-
   val bitcoind = new Fixture[BitcoindRpcClient]("bitcoin-monitor") {
     val credentials = BitcoindAuthCredentials.PasswordBased(TestWallet, TestWallet)
 
-    val bitcoindInstance: BitcoindRpcClient =
-      BitcoinMonitor.Bitcoind.remoteConnection(RegTest, "http://localhost", credentials)
+    val bitcoindInstance: BitcoindRpcClient = BitcoinMonitor.Bitcoind.remoteConnection(RegTest, "http://localhost", credentials)
     def apply() = bitcoindInstance
 
     override def beforeAll(): Unit = {
       println("beforeall")
       Await.result(
-        bitcoindInstance
-          .createWallet(TestWallet, descriptors = true)
-          .recover(_ => ()), // In case wallet already exists
-        5.seconds
-      )
+        bitcoindInstance.createWallet(TestWallet, descriptors = true)
+        .recover(_ => ()), // In case wallet already exists
+        5.seconds)
       println("wallet initialized")
     }
   }
   override def munitFixtures = List(bitcoind)
 
   test("Monitor only new blocks") {
     val bitcoindInstance = bitcoind()
-    assertIO(
-      for {
-        monitor <- BitcoinMonitor(bitcoindInstance)
-        blockStream = monitor.monitorBlocks()
-        mintBlocks <- IO.fromFuture(
-          IO(bitcoindInstance.getNewAddress(Some(TestWallet)).flatMap(bitcoindInstance.generateToAddress(NumBlocks, _)))
-        )
-        // After 0.5 second to allow the minted blocks to occur on the bitcoin instance
-        blocks <- blockStream.interruptAfter(500.millis).compile.toList
-        _ = monitor.stop()
-      } yield blocks.map(_.block.blockHeader.hashBE).toVector == mintBlocks,
+    assertIO(for {
+      monitor <- BitcoinMonitor(bitcoindInstance)
+      blockStream = monitor.monitorBlocks()
+      mintBlocks <- IO.fromFuture(IO(bitcoindInstance.getNewAddress(Some(TestWallet)).flatMap(bitcoindInstance.generateToAddress(NumBlocks, _))))
+      // After 0.5 second to allow the minted blocks to occur on the bitcoin instance
+      blocks <- blockStream.interruptAfter(500.millis).compile.toList
+      _ = monitor.stop()
+    } yield blocks.map(_.block.blockHeader.hashBE).toVector == mintBlocks,
       true
     )
   }
-
   test("Monitor new blocks and report existing blocks") {
     val bitcoindInstance = bitcoind()
-    val existingBlocks = Await.result(
-      bitcoindInstance.getNewAddress(Some(TestWallet)).flatMap(bitcoindInstance.generateToAddress(NumBlocks, _)),
-      5.seconds
-    )
+    val existingBlocks = Await.result(bitcoindInstance.getNewAddress(Some(TestWallet)).flatMap(bitcoindInstance.generateToAddress(NumBlocks, _)), 5.seconds)
     // Allow 0.5 second to allow the minted blocks to occur on the bitcoin instance
     Thread.sleep(500)
-    assertIO(
-      for {
-        monitor <- BitcoinMonitor(bitcoindInstance, Some(existingBlocks.head))
-        blockStream = monitor.monitorBlocks()
-        mintBlocks <- IO.fromFuture(
-          IO(bitcoindInstance.getNewAddress(Some(TestWallet)).flatMap(bitcoindInstance.generateToAddress(NumBlocks, _)))
-        )
-        blocks <- blockStream.interruptAfter(1.seconds).compile.toList
-        _ = monitor.stop()
-      } yield {
-        println(existingBlocks)
-        println(mintBlocks)
-        println(blocks.map(_.block.blockHeader.hashBE).toVector)
-        blocks.map(_.block.blockHeader.hashBE).toVector == (existingBlocks ++ mintBlocks)
-      },
+    assertIO(for {
+      monitor <- BitcoinMonitor(bitcoindInstance, Some(existingBlocks.head))
+      blockStream = monitor.monitorBlocks()
+      mintBlocks <- IO.fromFuture(IO(bitcoindInstance.getNewAddress(Some(TestWallet)).flatMap(bitcoindInstance.generateToAddress(NumBlocks, _))))
+      blocks <- blockStream.interruptAfter(1.seconds).compile.toList
+      _ = monitor.stop()
+    } yield {
+      println(existingBlocks)
+      println(mintBlocks)
+      println(blocks.map(_.block.blockHeader.hashBE).toVector)
+      blocks.map(_.block.blockHeader.hashBE).toVector == (existingBlocks ++ mintBlocks)
+    },
       true
     )
   }

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,7 +9,7 @@ object Dependencies {
     val circeVersion = "0.14.6"
     val protobufSpecsVersion = "2.0.0-beta2"
     val mUnitTeVersion = "0.7.29"
-    val btcVersion = "1.9.8"
+    val btcVersion = "1.9.7"
   }
 
   val catsSlf4j: ModuleID =
@@ -22,12 +22,12 @@ object Dependencies {
   )
 
   val scalacheck: Seq[ModuleID] = Seq(
-    "org.scalacheck"    %% "scalacheck"      % "1.17.1",
+    "org.scalacheck"    %% "scalacheck"      % "1.17.0",
     "org.scalatestplus" %% "scalacheck-1-16" % "3.2.14.0"
   )
 
   val scalamock: Seq[ModuleID] = Seq(
-    "org.scalamock" %% "scalamock" % "6.0.0"
+    "org.scalamock" %% "scalamock" % "5.2.0"
   )
 
   val scalatest: Seq[ModuleID] = Seq(
@@ -63,10 +63,10 @@ object Dependencies {
   )
 
   val sqlite: Seq[ModuleID] = Seq(
-    "org.xerial" % "sqlite-jdbc" % "3.45.3.0"
+    "org.xerial" % "sqlite-jdbc" % "3.45.2.0"
   )
 
-  val grpcNetty = "io.grpc" % "grpc-netty" % "1.63.0"
+  val grpcNetty = "io.grpc" % "grpc-netty" % "1.62.2"
 
   val btc: Seq[ModuleID] = Seq(
     "org.bitcoin-s" %% "bitcoin-s-core"         % btcVersion,
@@ -77,7 +77,7 @@ object Dependencies {
   object Crypto {
 
     lazy val sources: Seq[ModuleID] =
-      Seq("org.bouncycastle" % "bcprov-jdk18on" % "1.78.1") ++
+      Seq("org.bouncycastle" % "bcprov-jdk18on" % "1.77") ++
       circe ++
       newType ++
       cats ++