From e590600fcd3e03a0efe54b24a5a1b10c9dad6411 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 6 Jan 2022 00:51:45 +0100 Subject: [PATCH 1/2] Update scalafmt-core to 3.0.8 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 2d9771b..e8f67ff 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.5" +version = "3.0.8" maxColumn = 140 project.git = true From b75075a55b65a0867e082d1a1fd3c9fb8a207c98 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 6 Jan 2022 00:51:59 +0100 Subject: [PATCH 2/2] Reformat with scalafmt 3.0.8 --- .../script/BitcoinCoreScriptSpec.scala | 87 +++++++++---------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/src/test/scala/it/softfork/bitcoin4s/script/BitcoinCoreScriptSpec.scala b/src/test/scala/it/softfork/bitcoin4s/script/BitcoinCoreScriptSpec.scala index 5c2b84c..22d066f 100644 --- a/src/test/scala/it/softfork/bitcoin4s/script/BitcoinCoreScriptSpec.scala +++ b/src/test/scala/it/softfork/bitcoin4s/script/BitcoinCoreScriptSpec.scala @@ -37,50 +37,49 @@ class BitcoinCoreScriptSpec extends Spec with BitcoinCoreScriptTestRunner { val rawScriptTests = scriptTestsConfig .filter(_.length > 3) - lazy val scriptTests = rawScriptTests.collect { - case elements @ (head :: tail) => - if (head.isInstanceOf[ConfigList]) { - val witnessElement = head.toList().map(_.render) - val amount = (BigDecimal(witnessElement.last) * 100000000).toLong - val stringTail = tail.map(stripDoubleQuotes) - val comments = (stringTail.length == 5).option(stringTail.last).getOrElse("") - val witnesses = witnessElement.reverse.tail - .flatMap { rawWitness => - allCatch.opt(Hex.decode(stripDoubleQuotes(rawWitness))) - } - .map(ScriptConstant.apply) - val List(scriptSigString, scriptPubKeyString, scriptFlagsString, expectedResultString) = stringTail.take(4) - val scriptFlags = toScriptFlags(scriptFlagsString) - val expectedResult = ExpectedResult.fromString(expectedResultString).value - - TestCase( - scriptSig = Parser.parse(scriptSigString), - scriptPubKey = Parser.parse(scriptPubKeyString), - scriptFlags = scriptFlags, - expectedResult = expectedResult, - comments = comments, - witness = Some((witnesses, amount)), - raw = elements.toString - ) - } else { - val stringElements = elements.map(stripDoubleQuotes) - val List(scriptSigString, scriptPubKeyString, scriptFlagsString, expectedResultString) = stringElements.take(4) - val expectedResult = ExpectedResult.fromString(expectedResultString).value - val comments = (stringElements.length == 5).option(stringElements.last).getOrElse("") - val scriptFlags = toScriptFlags(scriptFlagsString) - val scriptSig = Parser.parse(scriptSigString) - val scriptPubKey = Parser.parse(scriptPubKeyString) - - TestCase( - scriptSig = scriptSig, - scriptPubKey = scriptPubKey, - scriptFlags = scriptFlags, - expectedResult = expectedResult, - comments = comments, - witness = None, - raw = elements.toString - ) - } + lazy val scriptTests = rawScriptTests.collect { case elements @ (head :: tail) => + if (head.isInstanceOf[ConfigList]) { + val witnessElement = head.toList().map(_.render) + val amount = (BigDecimal(witnessElement.last) * 100000000).toLong + val stringTail = tail.map(stripDoubleQuotes) + val comments = (stringTail.length == 5).option(stringTail.last).getOrElse("") + val witnesses = witnessElement.reverse.tail + .flatMap { rawWitness => + allCatch.opt(Hex.decode(stripDoubleQuotes(rawWitness))) + } + .map(ScriptConstant.apply) + val List(scriptSigString, scriptPubKeyString, scriptFlagsString, expectedResultString) = stringTail.take(4) + val scriptFlags = toScriptFlags(scriptFlagsString) + val expectedResult = ExpectedResult.fromString(expectedResultString).value + + TestCase( + scriptSig = Parser.parse(scriptSigString), + scriptPubKey = Parser.parse(scriptPubKeyString), + scriptFlags = scriptFlags, + expectedResult = expectedResult, + comments = comments, + witness = Some((witnesses, amount)), + raw = elements.toString + ) + } else { + val stringElements = elements.map(stripDoubleQuotes) + val List(scriptSigString, scriptPubKeyString, scriptFlagsString, expectedResultString) = stringElements.take(4) + val expectedResult = ExpectedResult.fromString(expectedResultString).value + val comments = (stringElements.length == 5).option(stringElements.last).getOrElse("") + val scriptFlags = toScriptFlags(scriptFlagsString) + val scriptSig = Parser.parse(scriptSigString) + val scriptPubKey = Parser.parse(scriptPubKeyString) + + TestCase( + scriptSig = scriptSig, + scriptPubKey = scriptPubKey, + scriptFlags = scriptFlags, + expectedResult = expectedResult, + comments = comments, + witness = None, + raw = elements.toString + ) + } } scriptTests.zipWithIndex.foreach(Function.tupled(run))