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

2020 12 18 enable lint options (#2454)

Browse source 
* Enable -Xlint:adapted-args,nullary-unit on our for compile scope

* Add Xlint:infer-any compiler option

* Fix build so test compiler options are actually enabled

* Enable more scalac linting options

* Add '-Xlint:eta-sam'

* Add 'Xlint:inaccessible,Xlint:missing-interpolator'
This commit is contained in:
Chris Stewart 2021-01-03 08:01:26 -06:00 • committed by GitHub
parent 8e6a37e988
commit b0b56dd5da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 75 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/InitNumericContractDialog.scala
View file

@ -186,7 +186,7 @@ object InitNumericContractDialog {
) {
val outcome = BigDecimal(outcomeTF.text.value.toDouble)
val level = roundingLevelTF.text.value.toLong
Some(outcome, level)
Some((outcome, level))
} else {
None
}

3
app/server-routes/src/main/scala/org/bitcoins/server/routes/Server.scala
View file

@ -61,7 +61,8 @@ case class Server(
val route: Route =
// TODO implement better logging
DebuggingDirectives.logRequestResult("http-rpc-server", Logging.InfoLevel) {
DebuggingDirectives.logRequestResult(
("http-rpc-server", Logging.InfoLevel)) {
withErrorHandling {
pathSingleSlash {
post {

11
app/server/src/main/scala/org/bitcoins/server/BitcoindRpcBackendUtil.scala
View file

@ -164,10 +164,17 @@ object BitcoindRpcBackendUtil extends BitcoinSLogger {
}
val batchSize = 25
val batchedExecutedF = FutureUtil.batchExecute(elements = blockHashes,
val batchedExecutedF = {
for {
wallet <- walletF
wallet <- FutureUtil.batchExecute[DoubleSha256Digest, Wallet](
elements = blockHashes,
f = f,
init = Vector.empty,
init = wallet,
batchSize = batchSize)
} yield wallet
}
batchedExecutedF.map { _ =>
logger.info(

1
build.sbt
View file

@ -289,6 +289,7 @@ lazy val oracleServer = project
lazy val serverRoutes = project
.in(file("app/server-routes"))
.settings(CommonSettings.prodSettings: _*)
.settings(name := "bitcoin-s-server-routes")
.settings(libraryDependencies ++= Deps.serverRoutes)
.dependsOn(appCommons, dbCommons)

4
core-test/src/test/scala/org/bitcoins/core/script/interpreter/testprotocol/CoreTestCaseProtocol.scala
View file

@ -70,7 +70,7 @@ object CoreTestCaseProtocol extends DefaultJsonProtocol with BitcoinSLogger {
expectedResult,
"",
elements.toString,
Some(witness, amount)))
Some((witness, amount))))
} else if (elements.size == 5) {
val scriptPubKeyBytes: ByteVector = parseScriptPubKey(elements(1))
val scriptPubKey = ScriptPubKey(scriptPubKeyBytes)
@ -112,7 +112,7 @@ object CoreTestCaseProtocol extends DefaultJsonProtocol with BitcoinSLogger {
expectedResult,
comments,
elements.toString,
Some(witness, amount)))
Some((witness, amount))))
} else None
}

2
core/src/main/scala/org/bitcoins/core/hd/HDPath.scala
View file

@ -4,7 +4,7 @@ import org.bitcoins.crypto.StringFactory
import scala.util.{Failure, Success, Try}
private[bitcoins] trait HDPath extends BIP32Path {
trait HDPath extends BIP32Path {
/**
* This type is to give a cleaner return

2
core/src/main/scala/org/bitcoins/core/protocol/dlc/DLCMessage.scala
View file

@ -392,7 +392,7 @@ object DLCMessage {
val offerPayout = offerContractInfo(msg)
val acceptPayout = (totalCollateral - offerPayout).satoshis
builder.+=(msg -> (oracleInfo.sigPoint(msg), offerPayout, acceptPayout))
builder.+=((msg, (oracleInfo.sigPoint(msg), offerPayout, acceptPayout)))
}
builder.result()

2
core/src/main/scala/org/bitcoins/core/protocol/transaction/Transaction.scala
View file

@ -172,7 +172,7 @@ object BaseTransaction extends Factory[BaseTransaction] {
def unapply(tx: NonWitnessTransaction): Option[
(Int32, Seq[TransactionInput], Seq[TransactionOutput], UInt32)] = {
Some(tx.version, tx.inputs, tx.outputs, tx.lockTime)
Some((tx.version, tx.inputs, tx.outputs, tx.lockTime))
}
}

5
core/src/main/scala/org/bitcoins/core/util/Base58.scala
View file

@ -139,7 +139,10 @@ sealed abstract class Base58 {
val decoded = decode(base58)
val firstByte = decoded.head
val compressedPubKey = List('K', 'L', 'c').contains(base58.head)
if (base58.contains(List('0', 'O', 'l', 'I'))) false
val hasInvalidChar: Boolean = {
Vector('0', 'O', 'l', 'I').exists(c => base58.contains(c))
}
if (hasInvalidChar) false
else if (compressedPubKey) checkCompressedPubKeyValidity(base58)
else if (isValidAddressPreFixByte(firstByte))
base58.length >= 26 && base58.length <= 35

2
crypto/src/main/scala/org/bitcoins/crypto/AesCrypt.scala
View file

@ -193,7 +193,7 @@ object AesKey {
* and must be 16, 24 or 32 bytes long.
*/
def fromBytes(bytes: ByteVector): Option[AesKey] = {
if (keylengths.contains(bytes.length)) {
if (keylengths.exists(k => k == bytes.length)) {
Some(AesKey(bytes))
} else {
None

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

@ -860,7 +860,7 @@ class EclairRpcClient(
.get()} for paymentId=${paymentId} for interval=${interval}"))
} else {
val resultsF = getSentInfo(paymentId)
resultsF.recover {
resultsF.failed.foreach {
case e: Throwable =>
logger.error(
s"Cannot check payment status for paymentId=${paymentId}",

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

@ -49,7 +49,7 @@ abstract class CachedHttpFeeRateProvider extends HttpFeeRateProvider {
private def updateFeeRate(): Future[FeeUnit] = {
implicit val ec: ExecutionContextExecutor = system.dispatcher
super.getFeeRate.map { feeRate =>
cachedFeeRateOpt = Some(feeRate, TimeUtil.now)
cachedFeeRateOpt = Some((feeRate, TimeUtil.now))
feeRate
}
}

2
node-test/src/test/scala/org/bitcoins/node/NeutrinoNodeTest.scala
View file

@ -56,7 +56,7 @@ class NeutrinoNodeTest extends NodeUnitTest {
}
def callbacks: NodeCallbacks = {
NodeCallbacks(onBlockReceived = Vector(blockCallback))
NodeCallbacks(onBlockReceived = Vector(blockCallback(_)))
}
behavior of "NeutrinoNode"

2
node-test/src/test/scala/org/bitcoins/node/networking/peer/DataMessageHandlerTest.scala
View file

@ -60,7 +60,7 @@ class DataMessageHandlerTest extends NodeUnitTest {
_ <- dataMessageHandler.handleDataPayload(payload1, sender)
_ <- dataMessageHandler.handleDataPayload(payload2, sender)
result <- resultP.future
} yield assert(result == (merkleBlock, Vector(tx)))
} yield assert(result == ((merkleBlock, Vector(tx))))
}
it must "verify OnBlockReceived callbacks are executed" in {

2
node/src/main/scala/org/bitcoins/node/models/BroadcastAbleTransactionDAO.scala
View file

@ -68,7 +68,7 @@ final case class BroadcastAbleTransactionDAO()(implicit
}
private val toTuple: BroadcastAbleTransaction => Option[Tuple] = tx =>
Some(tx.transaction.txId.flip, tx.transaction.bytes)
Some((tx.transaction.txId.flip, tx.transaction.bytes))
def txid: Rep[DoubleSha256DigestBE] = column("txid", O.PrimaryKey)
def bytes: Rep[ByteVector] = column("tx_bytes")

31
project/CommonSettings.scala
View file

@ -41,7 +41,8 @@ object CommonSettings {
apiURL := homepage.value.map(_.toString + "/api").map(url(_)),
// scaladoc settings end
////
scalacOptions in Compile := compilerOpts(scalaVersion.value),
scalacOptions in Compile := compilerOpts(scalaVersion = scalaVersion.value),
Test / scalacOptions := testCompilerOpts(scalaVersion = scalaVersion.value),
//remove annoying import unused things in the scala console
//https://stackoverflow.com/questions/26940253/in-sbt-how-do-you-override-scalacoptions-for-console-in-all-configurations
scalacOptions in (Compile, console) ~= (_ filterNot (s =>
@ -75,7 +76,23 @@ object CommonSettings {
)
}
private val scala2_13CompilerOpts = Seq("-Xlint:unused", "-Xfatal-warnings")
/** Linting options for scalac */
private val scala2_13CompilerLinting = {
Seq(
"-Xlint:unused",
"-Xlint:adapted-args",
"-Xlint:nullary-unit",
"-Xlint:inaccessible",
"-Xlint:infer-any",
"-Xlint:missing-interpolator",
"-Xlint:eta-sam"
)
}
/** Compiler options for source code */
private val scala2_13SourceCompilerOpts = {
Seq("-Xfatal-warnings") ++ scala2_13CompilerLinting
}
private val nonScala2_13CompilerOpts = Seq(
"-Xmax-classfile-name",
@ -85,10 +102,8 @@ object CommonSettings {
)
//https://docs.scala-lang.org/overviews/compiler-options/index.html
def compilerOpts(scalaVersion: String): Seq[String] =
def compilerOpts(scalaVersion: String): Seq[String] = {
Seq(
"-encoding",
"UTF-8",
"-unchecked",
"-feature",
"-deprecation",
@ -101,8 +116,10 @@ object CommonSettings {
"-Ypatmat-exhaust-depth",
"off"
) ++ commonCompilerOpts ++ {
if (scalaVersion.startsWith("2.13")) scala2_13CompilerOpts
else nonScala2_13CompilerOpts
if (scalaVersion.startsWith("2.13")) {
scala2_13SourceCompilerOpts
} else nonScala2_13CompilerOpts
}
}
def testCompilerOpts(scalaVersion: String): Seq[String] = {

12
testkit/src/main/scala/org/bitcoins/testkit/chain/SyncUtil.scala
View file

@ -115,10 +115,18 @@ abstract class SyncUtil extends BitcoinSLogger {
}
val batchSize = 25
val batchedExecutedF = FutureUtil.batchExecute(elements = blockHashes,
val batchedExecutedF = {
for {
wallet <- walletF
updatedWallet <-
FutureUtil.batchExecute[DoubleSha256Digest, Wallet](
elements = blockHashes,
f = f,
init = Vector.empty,
init = wallet,
batchSize = batchSize)
} yield updatedWallet
}
batchedExecutedF.map { _ =>
logger.info(

2
testkit/src/main/scala/org/bitcoins/testkit/core/gen/CryptoGenerators.scala
View file

@ -184,7 +184,7 @@ sealed abstract class CryptoGenerators {
*/
def privateKeySeqWithRequiredSigs(num: Int): Gen[(Seq[ECPrivateKey], Int)] = {
if (num <= 0) {
Gen.const(Nil, 0)
Gen.const((Nil, 0))
} else {
val privateKeys = privateKeySeq(num)
for {

4
testkit/src/main/scala/org/bitcoins/testkit/core/gen/PSBTGenerators.scala
View file

@ -156,9 +156,7 @@ object PSBTGenerators {
}
Future.successful(
PSBT(psbt.globalMap, newInputsMaps, psbt.outputMaps),
infos,
fee)
(PSBT(psbt.globalMap, newInputsMaps, psbt.outputMaps), infos, fee))
}
}
}

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

@ -77,7 +77,7 @@ trait EclairRpcTestUtil extends BitcoinSLogger {
port: Int = RpcUtil.randomPort,
apiPort: Int = RpcUtil.randomPort): Config = {
val configMap = {
Map(
Map[String, Any](
"eclair.chain" -> "regtest",
"eclair.spv" -> false,
"eclair.server.public-ips.1" -> "127.0.0.1",

4
wallet/src/main/scala/org/bitcoins/wallet/Wallet.scala
View file

@ -121,7 +121,7 @@ abstract class Wallet
// safe since we're deriving from a priv
val xpub = keyManager.deriveXPub(account).get
accountDAO.read(account.coin, account.index).flatMap {
accountDAO.read((account.coin, account.index)).flatMap {
case Some(account) =>
if (account.xpub != xpub) {
val errorMsg =
@ -918,7 +918,7 @@ object Wallet extends WalletLogger {
//2. We already have this account in our database, so we do nothing
//3. We have this account in our database, with a DIFFERENT xpub. This is bad. Fail with an exception
// this most likely means that we have a different key manager than we expected
wallet.accountDAO.read(account.coin, account.index).flatMap {
wallet.accountDAO.read((account.coin, account.index)).flatMap {
case Some(account) =>
if (account.xpub != xpub) {
val errorMsg =

5
wallet/src/main/scala/org/bitcoins/wallet/models/ScriptPubKeyDAO.scala
View file

@ -61,9 +61,10 @@ case class ScriptPubKeyDAO()(implicit
private val toTuple: ScriptPubKeyDb => Option[ScriptPubKeyTuple] = {
scriptPubKeyDb =>
Some(scriptPubKeyDb.id,
Some(
(scriptPubKeyDb.id,
scriptPubKeyDb.scriptPubKey,
scriptPubKeyDb.scriptPubKey.scriptType)
scriptPubKeyDb.scriptPubKey.scriptType))
}
override def * =