mirror of
https://github.com/bitcoin-s/bitcoin-s.git
synced 2025-03-03 10:46:42 +01:00
Fixed ClientTest
This commit is contained in:
parent
3a1c9284dc
commit
aa7f9012af
1 changed files with 9 additions and 22 deletions
|
@ -1,34 +1,28 @@
|
|||
package org.bitcoins.node.networking
|
||||
|
||||
import akka.actor.ActorSystem
|
||||
import akka.io.Tcp
|
||||
import akka.testkit.{TestActorRef, TestKit, TestProbe}
|
||||
import org.bitcoins.chain.config.ChainAppConfig
|
||||
import org.bitcoins.core.util.BitcoinSLogger
|
||||
import akka.testkit.{TestActorRef, TestProbe}
|
||||
import org.bitcoins.node.models.Peer
|
||||
import org.bitcoins.node.networking.peer.PeerMessageReceiver
|
||||
import org.bitcoins.node.networking.peer.PeerMessageReceiverState.Preconnection
|
||||
import org.bitcoins.testkit.BitcoinSAppConfig
|
||||
import org.bitcoins.testkit.async.TestAsyncUtil
|
||||
import org.bitcoins.testkit.node.NodeTestUtil
|
||||
import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil
|
||||
import org.bitcoins.testkit.util.BitcoindRpcTest
|
||||
import org.scalatest._
|
||||
|
||||
import scala.concurrent.{Await, Future}
|
||||
import scala.concurrent.duration.{Duration, DurationInt}
|
||||
import org.bitcoins.testkit.BitcoinSAppConfig
|
||||
import org.bitcoins.testkit.chain.ChainUnitTest
|
||||
import scala.concurrent.Future
|
||||
import scala.concurrent.duration.DurationInt
|
||||
|
||||
/**
|
||||
* Created by chris on 6/7/16.
|
||||
*/
|
||||
class ClientTest
|
||||
extends AsyncFlatSpec
|
||||
extends BitcoindRpcTest
|
||||
with MustMatchers
|
||||
with BeforeAndAfter
|
||||
with BeforeAndAfterAll
|
||||
with BitcoinSLogger {
|
||||
implicit val system = ActorSystem(
|
||||
s"Client-Test-System-${System.currentTimeMillis()}")
|
||||
with BeforeAndAfterAll {
|
||||
|
||||
implicit private val config: BitcoinSAppConfig =
|
||||
BitcoinSAppConfig.getTestConfig()
|
||||
|
@ -37,13 +31,13 @@ class ClientTest
|
|||
|
||||
implicit val np = config.chainConf.network
|
||||
|
||||
lazy val bitcoindRpcF = BitcoindRpcTestUtil.startedBitcoindRpcClient()
|
||||
lazy val bitcoindRpcF = BitcoindRpcTestUtil.startedBitcoindRpcClient(clientAccum = clientAccum)
|
||||
|
||||
lazy val bitcoindPeerF = bitcoindRpcF.map { bitcoind =>
|
||||
NodeTestUtil.getBitcoindPeer(bitcoind)
|
||||
}
|
||||
|
||||
lazy val bitcoindRpc2F = BitcoindRpcTestUtil.startedBitcoindRpcClient()
|
||||
lazy val bitcoindRpc2F = BitcoindRpcTestUtil.startedBitcoindRpcClient(clientAccum = clientAccum)
|
||||
|
||||
lazy val bitcoindPeer2F = bitcoindRpcF.map { 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)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue