Rework BitcoindRpcTestUtil.getBinary() to match major and minor versions of bitcoind binary when possible (#5569)

bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala

@@ -378,15 +378,15 @@ object BitcoindVersion
   val known: Vector[BitcoindVersion] = standard
 
   case object V25 extends BitcoindVersion {
-    override def toString: String = "v25"
+    override def toString: String = "v25.2"
   }
 
   case object V26 extends BitcoindVersion {
-    override def toString: String = "v26"
+    override def toString: String = "v26.1"
   }
 
   case object V27 extends BitcoindVersion {
-    override def toString: String = "v27"
+    override def toString: String = "v27.0"
   }
 
   case object Unknown extends BitcoindVersion {
@@ -417,4 +417,17 @@ object BitcoindVersion
         newest
     }
   }
+
+  def findVersion(version: String): Option[BitcoindVersion] = {
+    // first try to match the version exactly
+    BitcoindVersion.known
+      .find(v => version == v.toString) match {
+      case Some(r) => Some(r)
+      case None    =>
+        // try to match the major version if we can't match it exactly
+        BitcoindVersion.known.find { v =>
+          version.startsWith(v.toString)
+        }
+    }
+  }
 }

bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala

@@ -51,22 +51,18 @@ sealed trait BitcoindInstanceLocal extends BitcoindInstance {
   def getVersion: BitcoindVersion = {
 
     val binaryPath = binary.getAbsolutePath
-
     val versionT = Try {
       val foundVersion =
         Seq(binaryPath, "--version").!!.split(Properties.lineSeparator).head
           .split(" ")
           .last
-      BitcoindVersion.known
-        .find(v => foundVersion.startsWith(v.toString))
-        .getOrElse {
-          println(
-            s"Unsupported Bitcoin Core version: $foundVersion. The latest supported version is ${BitcoindVersion.newest}")
-          logger.warn(
-            s"Unsupported Bitcoin Core version: $foundVersion. The latest supported version is ${BitcoindVersion.newest}"
-          )
-          BitcoindVersion.newest
-        }
+      BitcoindVersion.findVersion(foundVersion).getOrElse {
+        // else just default to the newest version of bitcoind
+        logger.warn(
+          s"Unsupported Bitcoin Core version: $foundVersion. The latest supported version is ${BitcoindVersion.newest}"
+        )
+        BitcoindVersion.newest
+      }
     }
 
     versionT match {

testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala

@@ -179,24 +179,35 @@ trait BitcoindRpcTestUtil extends BitcoinSLogger {
       // default to newest version
       case Unknown => getBinary(BitcoindVersion.newest, binaryDirectory)
       case known @ (V25 | V26 | V27) =>
-        val fileList = Files
+        val fileList: List[(Path, String)] = Files
           .list(binaryDirectory)
           .iterator()
           .asScala
           .toList
           .filter(f => Files.isDirectory(f))
+          .map(p => (p, p.toString.split("-").last))
         // drop leading 'v'
         val version = known.toString.drop(1)
-        val filtered = fileList.filter(f => f.toString.contains(version))
+        val exactMatchOpt = fileList.find { case (_, versionStr) =>
+          // try matching the version exactly
+          versionStr == version
+        }
 
-        if (filtered.isEmpty)
-          throw new RuntimeException(
-            s"bitcoind ${known.toString} is not installed in $binaryDirectory. Run `sbt downloadBitcoind`"
-          )
+        val versionFolder: Path = exactMatchOpt match {
+          case Some((p, _)) =>
+            p
+          case None =>
+            val filtered = fileList.filter(f => f.toString.contains(version))
+            if (filtered.isEmpty)
+              throw new RuntimeException(
+                s"bitcoind ${known.toString} is not installed in $binaryDirectory. Run `sbt downloadBitcoind`"
+              )
 
-        // might be multiple versions downloaded for
-        // each major version, i.e. 0.16.2 and 0.16.3
-        val versionFolder = filtered.max
+            // might be multiple versions downloaded for
+            // each major version, i.e. 0.16.2 and 0.16.3
+            val versionFolder = filtered.max
+            versionFolder._1
+        }
 
         versionFolder
           .resolve("bin")