mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-22 14:33:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix Eclair start/shutdown test (#684)

Browse source
This commit is contained in:
rorp 2019-08-09 13:56:33 -07:00 • committed by Chris Stewart
parent 5d8a4c0ef2
commit 5cac74d8a6
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
eclair-rpc-test/src/test/scala/org/bitcoins/eclair/rpc/EclairRpcClientTest.scala
View file

@ -7,11 +7,7 @@ import org.bitcoins.core.config.RegTest
import org.bitcoins.core.currency.{CurrencyUnit, CurrencyUnits, Satoshis} import org.bitcoins.core.currency.{CurrencyUnit, CurrencyUnits, Satoshis}
import org.bitcoins.core.number.{Int64, UInt64} import org.bitcoins.core.number.{Int64, UInt64}
import org.bitcoins.core.protocol.ln.LnParams.LnBitcoinRegTest import org.bitcoins.core.protocol.ln.LnParams.LnBitcoinRegTest
import org.bitcoins.core.protocol.ln.channel.{ import org.bitcoins.core.protocol.ln.channel.{ChannelId, ChannelState, FundedChannelId}
ChannelId,
ChannelState,
FundedChannelId
}
import org.bitcoins.core.protocol.ln.currency._ import org.bitcoins.core.protocol.ln.currency._
import org.bitcoins.core.protocol.ln.node.NodeId import org.bitcoins.core.protocol.ln.node.NodeId
import org.bitcoins.core.util.BitcoinSLogger import org.bitcoins.core.util.BitcoinSLogger
@ -29,11 +25,9 @@ import scala.concurrent.duration.DurationInt
import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil
import akka.stream.StreamTcpException import akka.stream.StreamTcpException
import org.bitcoins.core.protocol.BitcoinAddress import org.bitcoins.core.protocol.BitcoinAddress
import org.bitcoins.core.protocol.ln.{ import org.bitcoins.core.protocol.ln.{LnHumanReadablePart, LnInvoice, PaymentPreimage}
LnHumanReadablePart, import org.bitcoins.testkit.async.TestAsyncUtil
LnInvoice,
PaymentPreimage
}
import scala.concurrent.duration._ import scala.concurrent.duration._
class EclairRpcClientTest extends AsyncFlatSpec with BeforeAndAfterAll { class EclairRpcClientTest extends AsyncFlatSpec with BeforeAndAfterAll {
@ -327,15 +321,13 @@ class EclairRpcClientTest extends AsyncFlatSpec with BeforeAndAfterAll {
val eclair = new EclairRpcClient(server) val eclair = new EclairRpcClient(server)
eclair.start().map(_ => eclair) eclair.start().map(_ => eclair)
} }
_ <- TestAsyncUtil.retryUntilSatisfiedF(conditionF = () => eclair.isStarted(),
_ <- eclair.getInfo duration = 1.second,
maxTries = 60)
_ = EclairRpcTestUtil.shutdown(eclair) _ = EclairRpcTestUtil.shutdown(eclair)
_ <- eclair.getInfo _ <- TestAsyncUtil.retryUntilSatisfiedF(conditionF = () => eclair.isStarted().map(!_),
.map(_ => fail("Got info from a closed node!")) duration = 1.second,
.recover { maxTries = 60)
case _: StreamTcpException => ()
}
} yield succeed } yield succeed
} }
it should "be able to open and close a channel" in { it should "be able to open and close a channel" in {