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

Bump akka to 2.6.4, fix deprecated things (#1374)

Browse source 
* Bump akka to 2.6.4, fix deprecated things

* Bump to 2.6.5 akka

* Clean up imports

* Remove materializer from FeeProviders
This commit is contained in:
Chris Stewart 2020-05-30 08:49:28 -05:00 • committed by GitHub
parent fd67109d54
commit 5aeb8ebdd1
11 changed files with 31 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/server/src/main/scala/org/bitcoins/server/ChainRoutes.scala
View file

@ -1,16 +1,13 @@
package org.bitcoins.server
import akka.actor.ActorSystem
import akka.http.scaladsl.server._
import akka.http.scaladsl.server.Directives._
import akka.stream.ActorMaterializer
import akka.http.scaladsl.server._
import org.bitcoins.chain.api.ChainApi
import org.bitcoins.commons.serializers.Picklers._
case class ChainRoutes(chain: ChainApi)(implicit system: ActorSystem)
extends ServerRoute {
implicit val materializer = ActorMaterializer()
import system.dispatcher
def handleCommand: PartialFunction[ServerCommand, StandardRoute] = {

4
app/server/src/main/scala/org/bitcoins/server/CoreRoutes.scala
View file

@ -1,9 +1,8 @@
package org.bitcoins.server
import akka.actor.ActorSystem
import akka.http.scaladsl.server._
import akka.http.scaladsl.server.Directives._
import akka.stream.ActorMaterializer
import akka.http.scaladsl.server._
import org.bitcoins.core.api.CoreApi
import scala.util.{Failure, Success}
@ -11,7 +10,6 @@ import scala.util.{Failure, Success}
case class CoreRoutes(core: CoreApi)(implicit system: ActorSystem)
extends ServerRoute {
import system.dispatcher
implicit val materializer: ActorMaterializer = ActorMaterializer()
def handleCommand: PartialFunction[ServerCommand, StandardRoute] = {
case ServerCommand("finalizepsbt", arr) =>

2
app/server/src/main/scala/org/bitcoins/server/NodeRoutes.scala
View file

@ -3,7 +3,6 @@ package org.bitcoins.server
import akka.actor.ActorSystem
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server._
import akka.stream.ActorMaterializer
import org.bitcoins.node.Node
import scala.util.{Failure, Success}
@ -11,7 +10,6 @@ import scala.util.{Failure, Success}
case class NodeRoutes(node: Node)(implicit system: ActorSystem)
extends ServerRoute {
import system.dispatcher
implicit val materializer: ActorMaterializer = ActorMaterializer()
def handleCommand: PartialFunction[ServerCommand, StandardRoute] = {
case ServerCommand("getpeers", _) =>

2
app/server/src/main/scala/org/bitcoins/server/Server.scala
View file

@ -7,7 +7,6 @@ import akka.http.scaladsl.model._
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server._
import akka.http.scaladsl.server.directives.DebuggingDirectives
import akka.stream.ActorMaterializer
import de.heikoseeberger.akkahttpupickle.UpickleSupport._
import org.bitcoins.db.AppConfig
import upickle.{default => up}
@ -21,7 +20,6 @@ case class Server(
extends HttpLogger {
implicit private val config: AppConfig = conf
implicit val materializer = ActorMaterializer()
import system.dispatcher
/** Handles all server commands by throwing a MethodNotFound */

2
app/server/src/main/scala/org/bitcoins/server/WalletRoutes.scala
View file

@ -3,7 +3,6 @@ package org.bitcoins.server
import akka.actor.ActorSystem
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server._
import akka.stream.ActorMaterializer
import org.bitcoins.commons.serializers.Picklers._
import org.bitcoins.core.currency._
import org.bitcoins.node.Node
@ -16,7 +15,6 @@ case class WalletRoutes(wallet: WalletApi, node: Node)(
implicit system: ActorSystem)
extends ServerRoute {
import system.dispatcher
implicit val materializer = ActorMaterializer()
def handleCommand: PartialFunction[ServerCommand, StandardRoute] = {

33
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/Client.scala
View file

@ -1,36 +1,31 @@
package org.bitcoins.rpc.client.common
import java.nio.file.{Files, Path}
import java.util.UUID
import akka.actor.ActorSystem
import akka.http.javadsl.model.headers.HttpCredentials
import akka.http.scaladsl.Http
import akka.http.scaladsl.model._
import akka.stream.{ActorMaterializer, StreamTcpException}
import akka.stream.StreamTcpException
import akka.util.ByteString
import org.bitcoins.core.config.{MainNet, NetworkParameters, RegTest, TestNet3}
import org.bitcoins.core.util.{BitcoinSLogger, FutureUtil, StartStop}
import org.bitcoins.rpc.config.BitcoindInstance
import com.fasterxml.jackson.core.JsonParseException
import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts
import org.bitcoins.commons.serializers.JsonSerializers._
import org.bitcoins.core.config.{MainNet, NetworkParameters, RegTest, TestNet3}
import org.bitcoins.core.crypto.ECPrivateKeyUtil
import org.bitcoins.core.util.{BitcoinSLogger, FutureUtil, StartStop}
import org.bitcoins.crypto.ECPrivateKey
import org.bitcoins.rpc.BitcoindException
import org.bitcoins.rpc.config.BitcoindAuthCredentials.{CookieBased, PasswordBased}
import org.bitcoins.rpc.config.{BitcoindAuthCredentials, BitcoindInstance}
import org.bitcoins.rpc.util.AsyncUtil
import play.api.libs.json._
import scala.concurrent._
import scala.concurrent.duration.DurationInt
import scala.sys.process._
import scala.util.{Failure, Success, Try}
import java.nio.file.Files
import org.bitcoins.rpc.config.BitcoindAuthCredentials.CookieBased
import org.bitcoins.rpc.config.BitcoindAuthCredentials.PasswordBased
import java.nio.file.Path
import com.fasterxml.jackson.core.JsonParseException
import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts
import org.bitcoins.core.crypto.ECPrivateKeyUtil
import org.bitcoins.crypto.ECPrivateKey
import org.bitcoins.rpc.config.BitcoindAuthCredentials
import org.bitcoins.rpc.BitcoindException
import play.api.libs.json._
/**
* This is the base trait for Bitcoin Core
@ -62,8 +57,6 @@ trait Client extends BitcoinSLogger with StartStop[BitcoindRpcClient] {
instance.datadir.toPath.resolve("bitcoin.conf")
implicit protected val system: ActorSystem
implicit protected val materializer: ActorMaterializer =
ActorMaterializer.create(system)
implicit protected val executor: ExecutionContext = system.getDispatcher
implicit protected val network: NetworkParameters = instance.network
@ -296,7 +289,7 @@ trait Client extends BitcoinSLogger with StartStop[BitcoindRpcClient] {
}
protected def sendRequest(req: HttpRequest): Future[HttpResponse] = {
Http(materializer.system).singleRequest(req)
Http(system).singleRequest(req)
}
/** Parses the payload of the given response into JSON.

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

@ -13,7 +13,6 @@ import akka.http.scaladsl.Http
import akka.http.scaladsl.model._
import akka.http.scaladsl.model.headers.{Authorization, BasicHttpCredentials}
import akka.http.scaladsl.model.ws.{Message, TextMessage, WebSocketRequest}
import akka.stream.ActorMaterializer
import akka.stream.scaladsl.{Flow, Sink, Source}
import akka.util.ByteString
import org.bitcoins.commons.jsonmodels.eclair._
@ -54,12 +53,11 @@ class EclairRpcClient(val instance: EclairInstance, binary: Option[File] = None)
extends EclairApi
with StartStop[EclairRpcClient] {
implicit val m = ActorMaterializer.create(system)
private val logger = LoggerFactory.getLogger(this.getClass)
def getDaemon: EclairInstance = instance
implicit override def executionContext: ExecutionContext = m.executionContext
implicit override val executionContext: ExecutionContext = system.dispatcher
override def allChannels(): Future[Vector[ChannelDesc]] = {
eclairCall[Vector[ChannelDesc]]("allchannels")
@ -403,7 +401,7 @@ class EclairRpcClient(val instance: EclairInstance, binary: Option[File] = None)
}
}
val cancellable = system.scheduler.schedule(interval, interval, runnable)
val cancellable = system.scheduler.scheduleAtFixedRate(interval, interval)(runnable)
p.future.onComplete(_ => cancellable.cancel())
@ -666,7 +664,7 @@ class EclairRpcClient(val instance: EclairInstance, binary: Option[File] = None)
}
private def sendRequest(req: HttpRequest): Future[HttpResponse] = {
val respF = Http(m.system).singleRequest(req)
val respF = Http(system).singleRequest(req)
respF
}
@ -866,7 +864,7 @@ class EclairRpcClient(val instance: EclairInstance, binary: Option[File] = None)
}
}
val cancellable = system.scheduler.schedule(interval, interval, runnable)
val cancellable = system.scheduler.scheduleAtFixedRate(interval, interval)(runnable)
val f = p.future

4
fee-provider/src/main/scala/org/bitcoins/feeprovider/HttpFeeRateProvider.scala
View file

@ -5,7 +5,6 @@ import java.time.{Duration, Instant}
import akka.actor.ActorSystem
import akka.http.scaladsl.Http
import akka.http.scaladsl.model.{HttpRequest, Uri}
import akka.stream.ActorMaterializer
import akka.util.ByteString
import org.bitcoins.core.api.FeeRateApi
import org.bitcoins.core.util.TimeUtil
@ -17,8 +16,7 @@ import scala.util.Try
object HttpFeeRateProvider {
def makeApiCall(uri: Uri)(implicit system: ActorSystem): Future[String] = {
implicit val mat: ActorMaterializer = ActorMaterializer.create(system)
implicit val ec: ExecutionContextExecutor = mat.executionContext
implicit val ec: ExecutionContextExecutor = system.dispatcher
Http()
.singleRequest(HttpRequest(uri = uri))
.flatMap(

2
project/Deps.scala
View file

@ -13,7 +13,7 @@ object Deps {
val spray = "1.3.5"
val zeromq = "0.5.2"
val akkav = "10.1.12"
val akkaStreamv = "2.5.31"
val akkaStreamv = "2.6.5"
val playv = "2.7.4"
val scodecV = "1.1.14"
val junitV = "0.11"

2
testkit/src/main/scala/org/bitcoins/testkit/node/NodeUnitTest.scala
View file

@ -153,7 +153,7 @@ trait NodeUnitTest extends BitcoinSFixture {
}
}
system.scheduler.schedule(2.second, interval, genBlock)
system.scheduler.scheduleAtFixedRate(2.second, interval)(genBlock)
()
}
}

40
testkit/src/main/scala/org/bitcoins/testkit/rpc/BitcoindRpcTestUtil.scala
View file

@ -5,50 +5,30 @@ import java.net.URI
import java.nio.file.{Files, Path, Paths}
import akka.actor.ActorSystem
import akka.stream.ActorMaterializer
import org.bitcoins.commons.jsonmodels.bitcoind.RpcOpts.AddNodeArgument
import org.bitcoins.commons.jsonmodels.bitcoind.{
GetBlockWithTransactionsResult,
GetTransactionResult,
RpcOpts,
SignRawTransactionResult
}
import org.bitcoins.commons.jsonmodels.bitcoind.{GetBlockWithTransactionsResult, GetTransactionResult, RpcOpts, SignRawTransactionResult}
import org.bitcoins.core.compat.JavaConverters._
import org.bitcoins.core.config.RegTest
import org.bitcoins.core.currency.Bitcoins
import org.bitcoins.core.number.UInt32
import org.bitcoins.core.protocol.BitcoinAddress
import org.bitcoins.core.protocol.script.ScriptSignature
import org.bitcoins.core.protocol.transaction.{
Transaction,
TransactionInput,
TransactionOutPoint
}
import org.bitcoins.core.util.{BitcoinSLogger, EnvUtil}
import org.bitcoins.core.util.{EnvUtil}
import org.bitcoins.crypto.{
DoubleSha256Digest,
DoubleSha256DigestBE,
ECPublicKey
}
import org.bitcoins.core.protocol.transaction.{Transaction, TransactionInput, TransactionOutPoint}
import org.bitcoins.core.util.BitcoinSLogger
import org.bitcoins.rpc.BitcoindException
import org.bitcoins.rpc.client.common.BitcoindVersion.{
Unknown,
V16,
V17,
V18,
_
}
import org.bitcoins.rpc.client.common.BitcoindVersion.{Unknown, V16, V17, V18, _}
import org.bitcoins.rpc.client.common.{BitcoindRpcClient, BitcoindVersion}
import org.bitcoins.rpc.client.v16.BitcoindV16RpcClient
import org.bitcoins.rpc.client.v17.BitcoindV17RpcClient
import org.bitcoins.rpc.client.v18.BitcoindV18RpcClient
import org.bitcoins.rpc.client.v19.BitcoindV19RpcClient
import org.bitcoins.rpc.config.{
BitcoindAuthCredentials,
BitcoindConfig,
BitcoindInstance,
ZmqConfig
}
import org.bitcoins.rpc.config.{BitcoindAuthCredentials, BitcoindConfig, BitcoindInstance, ZmqConfig}
import org.bitcoins.rpc.util.{AsyncUtil, RpcUtil}
import org.bitcoins.testkit.util.{FileUtil, TestkitBinaries}
import org.bitcoins.util.ListUtil
@ -830,9 +810,7 @@ trait BitcoindRpcTestUtil extends BitcoinSLogger {
receiver: BitcoindRpcClient,
amount: Bitcoins = Bitcoins(1))(
implicit actorSystem: ActorSystem): Future[GetTransactionResult] = {
implicit val materializer: ActorMaterializer =
ActorMaterializer.create(actorSystem)
implicit val ec: ExecutionContextExecutor = materializer.executionContext
implicit val ec: ExecutionContextExecutor = actorSystem.dispatcher
for {
rawcoinbasetx <- createRawCoinbaseTransaction(sender, receiver, amount)
signedtx <- signRawTransaction(sender, rawcoinbasetx)
@ -867,8 +845,8 @@ trait BitcoindRpcTestUtil extends BitcoinSLogger {
address: BitcoinAddress,
amount: Bitcoins)(
implicit system: ActorSystem): Future[DoubleSha256DigestBE] = {
implicit val mat: ActorMaterializer = ActorMaterializer.create(system)
implicit val ec: ExecutionContextExecutor = mat.executionContext
implicit val ec: ExecutionContextExecutor = system.dispatcher
for {
txid <- fundMemPoolTransaction(sender, address, amount)