mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-03 10:46:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add officially supported version of bitcoind by eclair, also add the ability to specify which version of bitcoind you are using for EclairRpcTestUtil.getBitcoindRpc (#2490)

Browse source
This commit is contained in:
Chris Stewart 2021-01-08 11:43:48 -06:00 • committed by GitHub
parent b4a1d31f5c
commit 6eff248f3d
2 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eclair-rpc/src/main/scala/org/bitcoins/eclair/rpc/client/EclairRpcClient.scala
View file

@ -5,7 +5,6 @@ import java.net.InetSocketAddress
import java.nio.file.NoSuchFileException
import java.time.Instant
import java.util.concurrent.atomic.AtomicInteger
import akka.Done
import akka.actor.ActorSystem
import akka.http.javadsl.model.headers.HttpCredentials
@ -35,6 +34,7 @@ import org.bitcoins.crypto.{DoubleSha256DigestBE, Sha256Digest}
import org.bitcoins.eclair.rpc.api._
import org.bitcoins.eclair.rpc.config.EclairInstance
import org.bitcoins.eclair.rpc.network.NodeUri
import org.bitcoins.rpc.client.common.BitcoindVersion
import org.bitcoins.rpc.util.AsyncUtil
import org.slf4j.LoggerFactory
import play.api.libs.json._
@ -973,4 +973,9 @@ object EclairRpcClient {
/** The current version we support of Eclair */
private[bitcoins] val version = "0.4.1"
/** The bitcoind version that eclair is officially tested & supported with by ACINQ
* @see https://github.com/ACINQ/eclair/releases/tag/v0.4
*/
val bitcoindV: BitcoindVersion = BitcoindVersion.V19
}

36
testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala
View file

@ -62,13 +62,41 @@ trait EclairRpcTestUtil extends BitcoinSLogger {
BitcoindRpcTestUtil.startedBitcoindRpcClient(instance)
}
/** Creates a bitcoind instance with the given parameters */
def bitcoindInstance(
port: Int = RpcUtil.randomPort,
rpcPort: Int = RpcUtil.randomPort,
zmqPort: Int = RpcUtil.randomPort): BitcoindInstance = {
zmqPort: Int = RpcUtil.randomPort,
bitcoindV: BitcoindVersion =
EclairRpcClient.bitcoindV): BitcoindInstance = {
bitcoindV match {
case BitcoindVersion.V20 =>
BitcoindRpcTestUtil.v20Instance(port = port,
rpcPort = rpcPort,
zmqPort = zmqPort)
case BitcoindVersion.V19 =>
BitcoindRpcTestUtil.v19Instance(port = port,
rpcPort = rpcPort,
zmqPort = zmqPort)
case BitcoindVersion.V18 =>
BitcoindRpcTestUtil.v18Instance(port = port,
rpcPort = rpcPort,
zmqPort = zmqPort)
case BitcoindVersion.V17 =>
BitcoindRpcTestUtil.v17Instance(port = port,
rpcPort = rpcPort,
zmqPort = zmqPort)
case BitcoindVersion.V16 =>
BitcoindRpcTestUtil.v16Instance(port = port,
rpcPort = rpcPort,
zmqPort = zmqPort)
case BitcoindVersion.Experimental =>
BitcoindRpcTestUtil.vExperimentalInstance(port = port,
rpcPort = rpcPort,
zmqPort = zmqPort)
case BitcoindVersion.Unknown =>
sys.error(s"Cannot start eclair with an unknown instance of bitcoind")
}
}
//cribbed from https://github.com/Christewart/eclair/blob/bad02e2c0e8bd039336998d318a861736edfa0ad/eclair-core/src/test/scala/fr/acinq/eclair/integration/IntegrationSpec.scala#L140-L153
@ -676,7 +704,9 @@ trait EclairRpcTestUtil extends BitcoinSLogger {
EclairRpcTestUtil.awaitUntilChannelNormal(client1, chanId)
}
def getBitcoindRpc(eclairRpcClient: EclairRpcClient)(implicit
def getBitcoindRpc(
eclairRpcClient: EclairRpcClient,
bitcoindVersion: BitcoindVersion = EclairRpcClient.bitcoindV)(implicit
system: ActorSystem): BitcoindRpcClient = {
val bitcoindRpc = {
val instance = eclairRpcClient.instance
@ -686,7 +716,7 @@ trait EclairRpcTestUtil extends BitcoinSLogger {
uri = new URI("http://localhost:18333"),
rpcUri = auth.bitcoindRpcUri,
authCredentials = auth.bitcoinAuthOpt.get,
binary = BitcoindRpcTestUtil.getBinary(BitcoindVersion.newest)
binary = BitcoindRpcTestUtil.getBinary(bitcoindVersion)
)
BitcoindRpcClient.withActorSystem(bitcoindInstance)
}