Upgrade to scalac 2.13.11 (#5097)

* Upgrade to scalac 2.13.11

* Fix compile issues with scalac 2.13.11
This commit is contained in:
Chris Stewart 2023-06-08 10:27:39 -05:00 committed by GitHub
parent 295be36d63
commit ebe98959ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 23 additions and 16 deletions

View file

@ -13,6 +13,7 @@ import org.bitcoins.crypto.AesPassword
import org.bitcoins.dlc.wallet.DLCAppConfig
import org.bitcoins.node.NodeCallbacks
import org.bitcoins.node.callback.NodeCallbackStreamManager
import org.bitcoins.node.config.NodeAppConfig
import org.bitcoins.node.models.NodeStateDescriptorDAO
import org.bitcoins.rpc.client.common.BitcoindRpcClient
import org.bitcoins.server.util.CallbackUtil
@ -265,7 +266,8 @@ case class DLCWalletNeutrinoBackendLoader(
override val system: ActorSystem)
extends DLCWalletLoaderApi {
import system.dispatcher
implicit private val nodeConf = conf.nodeConf
implicit private val nodeConf: NodeAppConfig = conf.nodeConf
override def isWalletLoaded: Boolean = walletHolder.isInitialized
@ -318,7 +320,7 @@ case class DLCWalletBitcoindBackendLoader(
override val system: ActorSystem)
extends DLCWalletLoaderApi {
import system.dispatcher
implicit private val nodeConf = conf.nodeConf
implicit private val nodeConf: NodeAppConfig = conf.nodeConf
override def load(
walletNameOpt: Option[String],

View file

@ -320,7 +320,8 @@ object BitcoindRpcClient {
*/
private[rpc] val ActorSystemName = "bitcoind-rpc-client-created-by-bitcoin-s"
implicit private lazy val system = ActorSystem.create(ActorSystemName)
implicit private lazy val system: ActorSystem =
ActorSystem.create(ActorSystemName)
/** Creates an RPC client from the given instance.
*

View file

@ -24,7 +24,8 @@ class NetworkPayloadTest extends BitcoinSUnitTest {
}
// this tests has a bunch of messages to choose between, so we set a high config value
implicit override val generatorDrivenConfig = customGenDrivenConfig(100)
implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
customGenDrivenConfig(100)
it must "parse messages based on its command name" in {
forAll(P2PGenerator.message) { p2p =>
val bytes = p2p.bytes

View file

@ -41,7 +41,7 @@ trait BitcoinSCryptoAsyncTest
with Matchers
with ScalaCheckPropertyChecks {
implicit override def executionContext =
implicit override def executionContext: ExecutionContext =
scala.concurrent.ExecutionContext.Implicits.global
def generatorDrivenConfigNewCode: PropertyCheckConfiguration = {

View file

@ -6,7 +6,8 @@ import scodec.bits.ByteVector
*/
class ECDigitalSignatureTest extends BitcoinSCryptoTest {
implicit override val generatorDrivenConfig = generatorDrivenConfigNewCode
implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
generatorDrivenConfigNewCode
"ECDigitalSignature" must "say that empty signature is a valid DER encoded signature" in {
val emptySiganture = ECDigitalSignature(ByteVector.empty)

View file

@ -3,7 +3,7 @@ import sbt.Keys.excludeLintKeys
import scala.util.Properties
val scala2_13 = "2.13.10"
val scala2_13 = "2.13.11"
ThisBuild / scalafmtOnCompile := !Properties.envOrNone("CI").contains("true")

View file

@ -16,7 +16,7 @@ import scala.concurrent.{ExecutionContext, Future}
case class PeerMessageSender(client: P2PClient)(implicit conf: NodeAppConfig)
extends P2PLogger {
private val socket = client.peer.socket
implicit private val timeout = Timeout(30.seconds)
implicit private val timeout: Timeout = Timeout(30.seconds)
/** Initiates a connection with the given peer */
def connect(): Unit = {

View file

@ -17,7 +17,7 @@ import scala.concurrent.ExecutionContext
*/
trait BitcoinSAkkaAsyncTest extends BaseAsyncTest with Logging {
this: AsyncTestSuite =>
implicit lazy val akkaTimeout = Timeout(duration)
implicit lazy val akkaTimeout: Timeout = Timeout(duration)
implicit val system: ActorSystem = {
ActorSystem(s"${getClass.getSimpleName}-${System.currentTimeMillis()}")

View file

@ -10,9 +10,11 @@ import akka.util.ByteString
import org.bitcoins.testkit.tor.CachedTor
import org.bitcoins.testkit.util.{BitcoinSAsyncTest, TorUtil}
import scala.concurrent.ExecutionContext
class Socks5ClientTransportSpec extends BitcoinSAsyncTest with CachedTor {
implicit val ec = system.dispatcher
implicit val ec: ExecutionContext = system.dispatcher
val proxyParams = torConfig.socks5ProxyParams.get

View file

@ -54,7 +54,7 @@ class TrezorAddressTest extends BitcoinSWalletTest with EmptyFixture {
Json.parse(rawText)
}
implicit val hdpathReads = new Reads[HDPath] {
implicit val hdpathReads: Reads[HDPath] = new Reads[HDPath] {
override def reads(json: JsValue): JsResult[HDPath] =
json
@ -65,7 +65,7 @@ class TrezorAddressTest extends BitcoinSWalletTest with EmptyFixture {
})
}
implicit val hdcoinReads = new Reads[HDCoinType] {
implicit val hdcoinReads: Reads[HDCoinType] = new Reads[HDCoinType] {
override def reads(json: JsValue): JsResult[HDCoinType] =
json.validate[String].map(_.toLowerCase).map {
@ -74,7 +74,7 @@ class TrezorAddressTest extends BitcoinSWalletTest with EmptyFixture {
}
}
implicit val hdpurposeReads = new Reads[HDPurpose] {
implicit val hdpurposeReads: Reads[HDPurpose] = new Reads[HDPurpose] {
override def reads(json: JsValue): JsResult[HDPurpose] =
json.validate[String].map {
@ -84,7 +84,7 @@ class TrezorAddressTest extends BitcoinSWalletTest with EmptyFixture {
}
}
implicit val hdchainType = new Reads[HDChainType] {
implicit val hdchainType: Reads[HDChainType] = new Reads[HDChainType] {
override def reads(json: JsValue): JsResult[HDChainType] =
json.validate[String].map(_.toLowerCase).map {
@ -100,7 +100,7 @@ class TrezorAddressTest extends BitcoinSWalletTest with EmptyFixture {
address: BitcoinAddress)
object TestAddress {
implicit val reads = Json.reads[TestAddress]
implicit val reads: Reads[TestAddress] = Json.reads[TestAddress]
}
case class TestVector(
@ -111,7 +111,7 @@ class TrezorAddressTest extends BitcoinSWalletTest with EmptyFixture {
addresses: Vector[TestAddress])
object TestVector {
implicit val reads = Json.reads[TestVector]
implicit val reads: Reads[TestVector] = Json.reads[TestVector]
}
lazy val vectors = json.validate[Vector[TestVector]] match {