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

Give sbt-api-mappings plugin a concrete version, fix compiler warnings with unused imports (#485)

Browse source
This commit is contained in:
Chris Stewart 2019-05-30 09:47:21 -05:00 • committed by GitHub
parent cacf37df41
commit a7b84ea718
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/common/BitcoindRpcClient.scala
View file

@ -1,10 +1,9 @@
package org.bitcoins.rpc.client.common package org.bitcoins.rpc.client.common
import akka.actor.ActorSystem
import org.bitcoins.rpc.config.BitcoindInstance
import scala.concurrent.Future
import java.io.File import java.io.File
import org.bitcoins.rpc.config.BitcoindConfig
import akka.actor.ActorSystem
import org.bitcoins.rpc.config.{BitcoindConfig, BitcoindInstance}
/** /**
* This class is not guaranteed to be compatible with any particular * This class is not guaranteed to be compatible with any particular

2
bitcoind-rpc/src/main/scala/org/bitcoins/rpc/client/v17/BitcoindV17RpcClient.scala
View file

@ -3,7 +3,7 @@ package org.bitcoins.rpc.client.v17
import akka.actor.ActorSystem import akka.actor.ActorSystem
import org.bitcoins.core.crypto.ECPrivateKey import org.bitcoins.core.crypto.ECPrivateKey
import org.bitcoins.core.protocol.BitcoinAddress import org.bitcoins.core.protocol.BitcoinAddress
import org.bitcoins.core.protocol.transaction.{Transaction, TransactionInput} import org.bitcoins.core.protocol.transaction.Transaction
import org.bitcoins.core.script.crypto.HashType import org.bitcoins.core.script.crypto.HashType
import org.bitcoins.rpc.client.common.{ import org.bitcoins.rpc.client.common.{
BitcoindRpcClient, BitcoindRpcClient,

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

@ -606,7 +606,7 @@ class EclairRpcClient(val instance: EclairInstance)(
getInfo.onComplete { getInfo.onComplete {
case Success(_) => case Success(_) =>
p.success(true) p.success(true)
case Failure(exc) => case Failure(_) =>
p.success(false) p.success(false)
} }

5
project/plugins.sbt
View file

@ -14,8 +14,7 @@ addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2") addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")
// ensure proper linkage across libraries in Scaladoc // ensure proper linkage across libraries in Scaladoc
addSbtPlugin( addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.0.0")
"com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "latest.release")
// bloop is a build server, enabling faster builds and more rapid dev feedback // bloop is a build server, enabling faster builds and more rapid dev feedback
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.2.5") addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.2.5")
@ -25,4 +24,4 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.2.5")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.6") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.6")
// write markdown files with type-checked Scala // write markdown files with type-checked Scala
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.3.0" ) addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.3.0")

2
testkit/src/main/scala/org/bitcoins/testkit/eclair/rpc/EclairRpcTestUtil.scala
View file

@ -20,7 +20,7 @@ import org.bitcoins.eclair.rpc.config.EclairInstance
import org.bitcoins.eclair.rpc.json.PaymentResult import org.bitcoins.eclair.rpc.json.PaymentResult
import org.bitcoins.rpc.client.common.{BitcoindRpcClient, BitcoindVersion} import org.bitcoins.rpc.client.common.{BitcoindRpcClient, BitcoindVersion}
import org.bitcoins.rpc.client.v16.BitcoindV16RpcClient import org.bitcoins.rpc.client.v16.BitcoindV16RpcClient
import org.bitcoins.rpc.config.{BitcoindInstance, ZmqConfig} import org.bitcoins.rpc.config.{BitcoindInstance}
import org.bitcoins.rpc.util.RpcUtil import org.bitcoins.rpc.util.RpcUtil
import org.bitcoins.testkit.async.TestAsyncUtil import org.bitcoins.testkit.async.TestAsyncUtil
import org.bitcoins.testkit.rpc.{BitcoindRpcTestUtil, TestRpcUtil} import org.bitcoins.testkit.rpc.{BitcoindRpcTestUtil, TestRpcUtil}

12
testkit/src/main/scala/org/bitcoins/testkit/util/BitcoinSUnitTest.scala
View file

@ -1,5 +1,6 @@
package org.bitcoins.testkit.util package org.bitcoins.testkit.util
import org.scalactic.anyvals.PosInt
import org.scalatest.prop.PropertyChecks import org.scalatest.prop.PropertyChecks
import org.scalatest.{FlatSpec, MustMatchers} import org.scalatest.{FlatSpec, MustMatchers}
import org.slf4j.{Logger, LoggerFactory} import org.slf4j.{Logger, LoggerFactory}
@ -10,20 +11,19 @@ abstract class BitcoinSUnitTest
with MustMatchers with MustMatchers
with PropertyChecks { with PropertyChecks {
lazy protected val logger: Logger = LoggerFactory.getLogger(getClass) protected lazy val logger: Logger = LoggerFactory.getLogger(getClass)
/** The configuration for property based tests in our testing suite /** The configuration for property based tests in our testing suite
* See: http://www.scalatest.org/user_guide/writing_scalacheck_style_properties * See: http://www.scalatest.org/user_guide/writing_scalacheck_style_properties
*/ */
override implicit val generatorDrivenConfig: PropertyCheckConfiguration = { implicit override val generatorDrivenConfig: PropertyCheckConfiguration = {
generatorDriveConfigOldCode generatorDriveConfigOldCode
} }
private def buildConfig(executions: Int): PropertyCheckConfiguration = { private def buildConfig(executions: Int): PropertyCheckConfiguration = {
PropertyCheckConfig( PropertyCheckConfiguration(
minSuccessful = executions, minSuccessful = PosInt.from(executions).get,
minSize = executions, minSize = PosInt.from(executions).get,
maxSize = executions,
workers = 2 workers = 2
) )
} }