From ccae92d7dc4c2cb35119ac8b7e1695728338892d Mon Sep 17 00:00:00 2001 From: Pierre-Marie Padiou Date: Tue, 13 Apr 2021 18:38:26 +0200 Subject: [PATCH] (Minor) Minimize conflicts with feature branches (#1765) * optional label in getReceiveAddress * use a separate variable for channel version --- eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala | 2 +- eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala | 2 +- .../scala/fr/acinq/eclair/blockchain/EclairWallet.scala | 5 ++++- .../eclair/blockchain/bitcoind/BitcoinCoreWallet.scala | 6 +++--- .../src/main/scala/fr/acinq/eclair/channel/Helpers.scala | 2 +- .../test/scala/fr/acinq/eclair/blockchain/TestWallet.scala | 2 +- .../eclair/blockchain/bitcoind/BitcoinCoreWalletSpec.scala | 6 +++--- .../scala/fr/acinq/eclair/channel/TxPublisherSpec.scala | 6 +++--- .../states/b/WaitForFundingCreatedInternalStateSpec.scala | 5 +++-- .../channel/states/b/WaitForFundingCreatedStateSpec.scala | 5 +++-- .../channel/states/b/WaitForFundingSignedStateSpec.scala | 5 +++-- .../channel/states/c/WaitForFundingConfirmedStateSpec.scala | 5 +++-- .../channel/states/c/WaitForFundingLockedStateSpec.scala | 5 +++-- .../fr/acinq/eclair/channel/states/h/ClosingStateSpec.scala | 5 +++-- .../fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala | 5 +++-- 15 files changed, 38 insertions(+), 28 deletions(-) diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala b/eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala index 354959521d..a55977084e 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/Eclair.scala @@ -243,7 +243,7 @@ class EclairImpl(appKit: Kit) extends Eclair { override def newAddress(): Future[String] = { appKit.wallet match { - case w: BitcoinCoreWallet => w.getReceiveAddress + case w: BitcoinCoreWallet => w.getReceiveAddress() case _ => Future.failed(new IllegalArgumentException("this call is only available with a bitcoin core backend")) } } diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala b/eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala index 78af59747c..f154ef9687 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala @@ -242,7 +242,7 @@ class Setup(datadir: File, _ <- Future.firstCompletedOf(routerInitialized.future :: routerTimeout :: Nil) wallet = new BitcoinCoreWallet(bitcoin) - _ = wallet.getReceiveAddress.map(address => logger.info(s"initial wallet address=$address")) + _ = wallet.getReceiveAddress().map(address => logger.info(s"initial wallet address=$address")) // do not change the name of this actor. it is used in the configuration to specify a custom bounded mailbox backupHandler = if (config.getBoolean("enable-db-backup")) { diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/EclairWallet.scala b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/EclairWallet.scala index 303d9147c8..f52c9b56a6 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/EclairWallet.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/EclairWallet.scala @@ -30,7 +30,10 @@ trait EclairWallet { def getBalance: Future[OnChainBalance] - def getReceiveAddress: Future[String] + /** + * @param label used if implemented with bitcoin core, can be ignored by implementation + */ + def getReceiveAddress(label: String = ""): Future[String] def getReceivePubkey(receiveAddress: Option[String] = None): Future[PublicKey] diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoinCoreWallet.scala b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoinCoreWallet.scala index 53fe8131d6..bc54965bcd 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoinCoreWallet.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoinCoreWallet.scala @@ -113,12 +113,12 @@ class BitcoinCoreWallet(rpcClient: BitcoinJsonRPCClient)(implicit ec: ExecutionC OnChainBalance(toSatoshi(confirmed), toSatoshi(unconfirmed)) }) - override def getReceiveAddress: Future[String] = for { - JString(address) <- rpcClient.invoke("getnewaddress") + override def getReceiveAddress(label: String): Future[String] = for { + JString(address) <- rpcClient.invoke("getnewaddress", label) } yield address override def getReceivePubkey(receiveAddress: Option[String] = None): Future[Crypto.PublicKey] = for { - address <- receiveAddress.map(Future.successful).getOrElse(getReceiveAddress) + address <- receiveAddress.map(Future.successful).getOrElse(getReceiveAddress()) JString(rawKey) <- rpcClient.invoke("getaddressinfo", address).map(_ \ "pubkey") } yield PublicKey(ByteVector.fromValidHex(rawKey)) diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala b/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala index 75ea60347e..10876e3014 100644 --- a/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala +++ b/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala @@ -226,7 +226,7 @@ object Helpers { /** NB: this is a blocking call, use carefully! */ def getFinalScriptPubKey(wallet: EclairWallet, chainHash: ByteVector32): ByteVector = { import scala.concurrent.duration._ - val finalAddress = Await.result(wallet.getReceiveAddress, 40 seconds) + val finalAddress = Await.result(wallet.getReceiveAddress(), 40 seconds) Script.write(addressToPublicKeyScript(finalAddress, chainHash)) } diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/TestWallet.scala b/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/TestWallet.scala index 9ee0c508bf..bad868a0d6 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/TestWallet.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/TestWallet.scala @@ -32,7 +32,7 @@ class TestWallet extends EclairWallet { override def getBalance: Future[OnChainBalance] = Future.successful(OnChainBalance(1105 sat, 561 sat)) - override def getReceiveAddress: Future[String] = Future.successful("bcrt1qwcv8naajwn8fjhu8z59q9e6ucrqr068rlcenux") + override def getReceiveAddress(label: String): Future[String] = Future.successful("bcrt1qwcv8naajwn8fjhu8z59q9e6ucrqr068rlcenux") override def getReceivePubkey(receiveAddress: Option[String] = None): Future[Crypto.PublicKey] = Future.successful(PublicKey(hex"028feba10d0eafd0fad8fe20e6d9206e6bd30242826de05c63f459a00aced24b12")) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoinCoreWalletSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoinCoreWalletSpec.scala index 322cef1508..48c7aee495 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoinCoreWalletSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/blockchain/bitcoind/BitcoinCoreWalletSpec.scala @@ -175,7 +175,7 @@ class BitcoinCoreWalletSpec extends TestKitBaseClass with BitcoindService with A wallet.getBalance.pipeTo(sender.ref) assert(sender.expectMsgType[OnChainBalance].confirmed > 0.sat) - wallet.getReceiveAddress.pipeTo(sender.ref) + wallet.getReceiveAddress().pipeTo(sender.ref) val address = sender.expectMsgType[String] assert(Try(addressToPublicKeyScript(address, Block.RegtestGenesisBlock.hash)).isSuccess) @@ -231,7 +231,7 @@ class BitcoinCoreWalletSpec extends TestKitBaseClass with BitcoindService with A wallet.getBalance.pipeTo(sender.ref) assert(sender.expectMsgType[OnChainBalance].confirmed > 0.sat) - wallet.getReceiveAddress.pipeTo(sender.ref) + wallet.getReceiveAddress().pipeTo(sender.ref) val address = sender.expectMsgType[String] assert(Try(addressToPublicKeyScript(address, Block.RegtestGenesisBlock.hash)).isSuccess) @@ -274,7 +274,7 @@ class BitcoinCoreWalletSpec extends TestKitBaseClass with BitcoindService with A val sender = TestProbe() val wallet = new BitcoinCoreWallet(bitcoinrpcclient) - wallet.getReceiveAddress.pipeTo(sender.ref) + wallet.getReceiveAddress().pipeTo(sender.ref) val address = sender.expectMsgType[String] wallet.getReceivePubkey(receiveAddress = Some(address)).pipeTo(sender.ref) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/channel/TxPublisherSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/channel/TxPublisherSpec.scala index 086f53a513..6d762c0fbe 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/channel/TxPublisherSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/channel/TxPublisherSpec.scala @@ -105,7 +105,7 @@ class TxPublisherSpec extends TestKitBaseClass with AnyFunSuiteLike with Bitcoin val bitcoinWallet = new BitcoinCoreWallet(walletRpcClient) val probe = TestProbe() utxos.foreach(amount => { - bitcoinWallet.getReceiveAddress.pipeTo(probe.ref) + bitcoinWallet.getReceiveAddress().pipeTo(probe.ref) val walletAddress = probe.expectMsgType[String] sendToAddress(walletAddress, amount, probe) }) @@ -279,7 +279,7 @@ class TxPublisherSpec extends TestKitBaseClass with AnyFunSuiteLike with Bitcoin assert(mempoolTx1.txid === commitTx.txid) // add more funds to our wallet - bitcoinWallet.getReceiveAddress.pipeTo(probe.ref) + bitcoinWallet.getReceiveAddress().pipeTo(probe.ref) val walletAddress = probe.expectMsgType[String] sendToAddress(walletAddress, 1 millibtc, probe) createBlocks(1) @@ -456,7 +456,7 @@ class TxPublisherSpec extends TestKitBaseClass with AnyFunSuiteLike with Bitcoin txPublisher ! ParentTxConfirmed(htlcSuccess, commitTx.txid) // Add more funds to our wallet to allow bumping HTLC txs. - bitcoinWallet.getReceiveAddress.pipeTo(probe.ref) + bitcoinWallet.getReceiveAddress().pipeTo(probe.ref) val walletAddress = probe.expectMsgType[String] sendToAddress(walletAddress, 1 millibtc, probe) createBlocks(1) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingCreatedInternalStateSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingCreatedInternalStateSpec.scala index 58e42f7123..75887ff558 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingCreatedInternalStateSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingCreatedInternalStateSpec.scala @@ -46,11 +46,12 @@ class WaitForFundingCreatedInternalStateSpec extends TestKitBaseClass with Fixtu } val setup = init(wallet = noopWallet) import setup._ + val channelVersion = ChannelVersion.STANDARD val aliceInit = Init(Alice.channelParams.features) val bobInit = Init(Bob.channelParams.features) within(30 seconds) { - alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, TestConstants.fundingSatoshis, TestConstants.pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, Alice.channelParams, alice2bob.ref, bobInit, ChannelFlags.Empty, ChannelVersion.STANDARD) - bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, bob2alice.ref, aliceInit, ChannelVersion.STANDARD) + alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, TestConstants.fundingSatoshis, TestConstants.pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, Alice.channelParams, alice2bob.ref, bobInit, ChannelFlags.Empty, channelVersion) + bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, bob2alice.ref, aliceInit, channelVersion) alice2bob.expectMsgType[OpenChannel] alice2bob.forward(bob) bob2alice.expectMsgType[AcceptChannel] diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingCreatedStateSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingCreatedStateSpec.scala index 70575e3a50..84b05cbd4a 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingCreatedStateSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingCreatedStateSpec.scala @@ -57,12 +57,13 @@ class WaitForFundingCreatedStateSpec extends TestKitBaseClass with FixtureAnyFun val setup = init(aliceNodeParams, bobNodeParams) import setup._ + val channelVersion = ChannelVersion.STANDARD val aliceInit = Init(aliceParams.features) val bobInit = Init(bobParams.features) within(30 seconds) { - alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, fundingSatoshis, pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, aliceParams, alice2bob.ref, bobInit, ChannelFlags.Empty, ChannelVersion.STANDARD) + alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, fundingSatoshis, pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, aliceParams, alice2bob.ref, bobInit, ChannelFlags.Empty, channelVersion) alice2blockchain.expectMsgType[TxPublisher.SetChannelId] - bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, bobParams, bob2alice.ref, aliceInit, ChannelVersion.STANDARD) + bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, bobParams, bob2alice.ref, aliceInit, channelVersion) bob2blockchain.expectMsgType[TxPublisher.SetChannelId] alice2bob.expectMsgType[OpenChannel] alice2bob.forward(bob) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingSignedStateSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingSignedStateSpec.scala index 158baed08d..8b1029f144 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingSignedStateSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/b/WaitForFundingSignedStateSpec.scala @@ -54,12 +54,13 @@ class WaitForFundingSignedStateSpec extends TestKitBaseClass with FixtureAnyFunS val setup = init(aliceNodeParams, bobNodeParams) import setup._ + val channelVersion = ChannelVersion.STANDARD val aliceInit = Init(aliceParams.features) val bobInit = Init(bobParams.features) within(30 seconds) { - alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, fundingSatoshis, pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, aliceParams, alice2bob.ref, bobInit, ChannelFlags.Empty, ChannelVersion.STANDARD) + alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, fundingSatoshis, pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, aliceParams, alice2bob.ref, bobInit, ChannelFlags.Empty, channelVersion) alice2blockchain.expectMsgType[TxPublisher.SetChannelId] - bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, bobParams, bob2alice.ref, aliceInit, ChannelVersion.STANDARD) + bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, bobParams, bob2alice.ref, aliceInit, channelVersion) bob2blockchain.expectMsgType[TxPublisher.SetChannelId] alice2bob.expectMsgType[OpenChannel] alice2bob.forward(bob) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForFundingConfirmedStateSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForFundingConfirmedStateSpec.scala index 4939e6d30c..a4feca32f5 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForFundingConfirmedStateSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForFundingConfirmedStateSpec.scala @@ -42,12 +42,13 @@ class WaitForFundingConfirmedStateSpec extends TestKitBaseClass with FixtureAnyF override def withFixture(test: OneArgTest): Outcome = { val setup = init() import setup._ + val channelVersion = ChannelVersion.STANDARD val aliceInit = Init(Alice.channelParams.features) val bobInit = Init(Bob.channelParams.features) within(30 seconds) { - alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, TestConstants.fundingSatoshis, TestConstants.pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, Alice.channelParams, alice2bob.ref, bobInit, ChannelFlags.Empty, ChannelVersion.STANDARD) + alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, TestConstants.fundingSatoshis, TestConstants.pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, Alice.channelParams, alice2bob.ref, bobInit, ChannelFlags.Empty, channelVersion) alice2blockchain.expectMsgType[TxPublisher.SetChannelId] - bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, bob2alice.ref, aliceInit, ChannelVersion.STANDARD) + bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, bob2alice.ref, aliceInit, channelVersion) bob2blockchain.expectMsgType[TxPublisher.SetChannelId] alice2bob.expectMsgType[OpenChannel] alice2bob.forward(bob) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForFundingLockedStateSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForFundingLockedStateSpec.scala index 5fd94ce0bf..bca805655f 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForFundingLockedStateSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/c/WaitForFundingLockedStateSpec.scala @@ -43,12 +43,13 @@ class WaitForFundingLockedStateSpec extends TestKitBaseClass with FixtureAnyFunS override def withFixture(test: OneArgTest): Outcome = { val setup = init() import setup._ + val channelVersion = ChannelVersion.STANDARD val aliceInit = Init(Alice.channelParams.features) val bobInit = Init(Bob.channelParams.features) within(30 seconds) { - alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, TestConstants.fundingSatoshis, TestConstants.pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, Some(initialRelayFees), Alice.channelParams, alice2bob.ref, bobInit, ChannelFlags.Empty, ChannelVersion.STANDARD) + alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, TestConstants.fundingSatoshis, TestConstants.pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, Some(initialRelayFees), Alice.channelParams, alice2bob.ref, bobInit, ChannelFlags.Empty, channelVersion) alice2blockchain.expectMsgType[TxPublisher.SetChannelId] - bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, bob2alice.ref, aliceInit, ChannelVersion.STANDARD) + bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, bob2alice.ref, aliceInit, channelVersion) bob2blockchain.expectMsgType[TxPublisher.SetChannelId] alice2bob.expectMsgType[OpenChannel] alice2bob.forward(bob) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/h/ClosingStateSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/h/ClosingStateSpec.scala index fea556c959..263038b963 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/h/ClosingStateSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/channel/states/h/ClosingStateSpec.scala @@ -63,11 +63,12 @@ class ClosingStateSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with if (unconfirmedFundingTx) { within(30 seconds) { + val channelVersion = ChannelVersion.STANDARD val aliceInit = Init(Alice.channelParams.features) val bobInit = Init(Bob.channelParams.features) - alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, TestConstants.fundingSatoshis, TestConstants.pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, Alice.channelParams, alice2bob.ref, bobInit, ChannelFlags.Empty, ChannelVersion.STANDARD) + alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, TestConstants.fundingSatoshis, TestConstants.pushMsat, TestConstants.feeratePerKw, TestConstants.feeratePerKw, None, Alice.channelParams, alice2bob.ref, bobInit, ChannelFlags.Empty, channelVersion) alice2blockchain.expectMsgType[TxPublisher.SetChannelId] - bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, bob2alice.ref, aliceInit, ChannelVersion.STANDARD) + bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, bob2alice.ref, aliceInit, channelVersion) bob2blockchain.expectMsgType[TxPublisher.SetChannelId] alice2bob.expectMsgType[OpenChannel] alice2bob.forward(bob) diff --git a/eclair-core/src/test/scala/fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala b/eclair-core/src/test/scala/fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala index 1376887f08..03669d4bf4 100644 --- a/eclair-core/src/test/scala/fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala +++ b/eclair-core/src/test/scala/fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala @@ -63,15 +63,16 @@ class RustyTestsSpec extends TestKitBaseClass with Matchers with FixtureAnyFunSu val feeEstimator = new TestFeeEstimator val aliceNodeParams = Alice.nodeParams.copy(blockCount = blockCount, onChainFeeConf = Alice.nodeParams.onChainFeeConf.copy(feeEstimator = feeEstimator)) val bobNodeParams = Bob.nodeParams.copy(blockCount = blockCount, onChainFeeConf = Bob.nodeParams.onChainFeeConf.copy(feeEstimator = feeEstimator)) + val channelVersion = ChannelVersion.STANDARD val alice: TestFSMRef[State, Data, Channel] = TestFSMRef(new Channel(aliceNodeParams, wallet, Bob.nodeParams.nodeId, alice2blockchain.ref, relayer, FakeTxPublisherFactory(alice2blockchain)), alicePeer.ref) val bob: TestFSMRef[State, Data, Channel] = TestFSMRef(new Channel(bobNodeParams, wallet, Alice.nodeParams.nodeId, bob2blockchain.ref, relayer, FakeTxPublisherFactory(bob2blockchain)), bobPeer.ref) val aliceInit = Init(Alice.channelParams.features) val bobInit = Init(Bob.channelParams.features) // alice and bob will both have 1 000 000 sat feeEstimator.setFeerate(FeeratesPerKw.single(FeeratePerKw(10000 sat))) - alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, 2000000 sat, 1000000000 msat, feeEstimator.getFeeratePerKw(target = 2), feeEstimator.getFeeratePerKw(target = 6), None, Alice.channelParams, pipe, bobInit, ChannelFlags.Empty, ChannelVersion.STANDARD) + alice ! INPUT_INIT_FUNDER(ByteVector32.Zeroes, 2000000 sat, 1000000000 msat, feeEstimator.getFeeratePerKw(target = 2), feeEstimator.getFeeratePerKw(target = 6), None, Alice.channelParams, pipe, bobInit, ChannelFlags.Empty, channelVersion) alice2blockchain.expectMsgType[TxPublisher.SetChannelId] - bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, pipe, aliceInit, ChannelVersion.STANDARD) + bob ! INPUT_INIT_FUNDEE(ByteVector32.Zeroes, Bob.channelParams, pipe, aliceInit, channelVersion) bob2blockchain.expectMsgType[TxPublisher.SetChannelId] pipe ! (alice, bob) within(30 seconds) {