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

Fixed ClientTest

Browse source
This commit is contained in:
rorp 2019-06-14 10:28:44 -07:00
parent 3a1c9284dc
commit aa7f9012af
1 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
node-test/src/test/scala/org/bitcoins/node/networking/ClientTest.scala
View file

@ -1,34 +1,28 @@
package org.bitcoins.node.networking package org.bitcoins.node.networking
import akka.actor.ActorSystem
import akka.io.Tcp import akka.io.Tcp
import akka.testkit.{TestActorRef, TestKit, TestProbe} import akka.testkit.{TestActorRef, TestProbe}
import org.bitcoins.chain.config.ChainAppConfig
import org.bitcoins.core.util.BitcoinSLogger
import org.bitcoins.node.models.Peer import org.bitcoins.node.models.Peer
import org.bitcoins.node.networking.peer.PeerMessageReceiver import org.bitcoins.node.networking.peer.PeerMessageReceiver
import org.bitcoins.node.networking.peer.PeerMessageReceiverState.Preconnection import org.bitcoins.node.networking.peer.PeerMessageReceiverState.Preconnection
import org.bitcoins.testkit.BitcoinSAppConfig
import org.bitcoins.testkit.async.TestAsyncUtil import org.bitcoins.testkit.async.TestAsyncUtil
import org.bitcoins.testkit.node.NodeTestUtil import org.bitcoins.testkit.node.NodeTestUtil
import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil
import org.bitcoins.testkit.util.BitcoindRpcTest
import org.scalatest._ import org.scalatest._
import scala.concurrent.{Await, Future} import scala.concurrent.Future
import scala.concurrent.duration.{Duration, DurationInt} import scala.concurrent.duration.DurationInt
import org.bitcoins.testkit.BitcoinSAppConfig
import org.bitcoins.testkit.chain.ChainUnitTest
/** /**
* Created by chris on 6/7/16. * Created by chris on 6/7/16.
*/ */
class ClientTest class ClientTest
extends AsyncFlatSpec extends BitcoindRpcTest
with MustMatchers with MustMatchers
with BeforeAndAfter with BeforeAndAfter
with BeforeAndAfterAll with BeforeAndAfterAll {
with BitcoinSLogger {
implicit val system = ActorSystem(
s"Client-Test-System-${System.currentTimeMillis()}")
implicit private val config: BitcoinSAppConfig = implicit private val config: BitcoinSAppConfig =
BitcoinSAppConfig.getTestConfig() BitcoinSAppConfig.getTestConfig()
@ -37,13 +31,13 @@ class ClientTest
implicit val np = config.chainConf.network implicit val np = config.chainConf.network
lazy val bitcoindRpcF = BitcoindRpcTestUtil.startedBitcoindRpcClient() lazy val bitcoindRpcF = BitcoindRpcTestUtil.startedBitcoindRpcClient(clientAccum = clientAccum)
lazy val bitcoindPeerF = bitcoindRpcF.map { bitcoind => lazy val bitcoindPeerF = bitcoindRpcF.map { bitcoind =>
NodeTestUtil.getBitcoindPeer(bitcoind) NodeTestUtil.getBitcoindPeer(bitcoind)
} }
lazy val bitcoindRpc2F = BitcoindRpcTestUtil.startedBitcoindRpcClient() lazy val bitcoindRpc2F = BitcoindRpcTestUtil.startedBitcoindRpcClient(clientAccum = clientAccum)
lazy val bitcoindPeer2F = bitcoindRpcF.map { bitcoind => lazy val bitcoindPeer2F = bitcoindRpcF.map { bitcoind =>
NodeTestUtil.getBitcoindPeer(bitcoind) NodeTestUtil.getBitcoindPeer(bitcoind)
@ -100,11 +94,4 @@ class ClientTest
} }
} }
override def afterAll: Unit = {
implicit val ec = system.dispatcher
Await.ready(bitcoindRpcF.flatMap(ChainUnitTest.destroyBitcoind(_)(system)), 10.seconds)
Await.ready(bitcoindRpc2F.flatMap(ChainUnitTest.destroyBitcoind(_)(system)), 10.seconds)
TestKit.shutdownActorSystem(system)
}
} }