mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-24 23:08:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixing bug where single OP_0 was being classified as a MultiSignatureScriptSig

Browse source
This commit is contained in:
Chris Stewart 2016-03-21 15:41:15 -05:00
parent df085162a4
commit 82d5713549
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/test/scala/org/scalacoin/protocol/script/ScriptSignatureFactoryTest.scala
View file

@ -22,6 +22,15 @@ class ScriptSignatureFactoryTest extends FlatSpec with MustMatchers {
} }
it must "given a single 0 a scriptSignature type of non standard" in {
val scriptSig = ScriptSignatureFactory.fromHex("00")
val result = scriptSig match {
case _ : NonStandardScriptSignature => true
case _ => false
}
result must be (true)
}
it must "build a script signature from a digital signature and a public key" in { it must "build a script signature from a digital signature and a public key" in {
val digitalSignatureBytes = TestUtil.p2pkhInputScriptAsm(1).bytes val digitalSignatureBytes = TestUtil.p2pkhInputScriptAsm(1).bytes
val digitalSignature : ECDigitalSignature = ECFactory.digitalSignature(digitalSignatureBytes) val digitalSignature : ECDigitalSignature = ECFactory.digitalSignature(digitalSignatureBytes)
@ -51,4 +60,6 @@ class ScriptSignatureFactoryTest extends FlatSpec with MustMatchers {
} }
} }

6
src/test/scala/org/scalacoin/script/interpreter/ScriptInterpreterTest.scala
View file

@ -84,7 +84,7 @@ class ScriptInterpreterTest extends FlatSpec with MustMatchers with ScriptInterp
val source = scala.io.Source.fromFile("src/test/scala/org/scalacoin/script/interpreter/script_valid.json") val source = scala.io.Source.fromFile("src/test/scala/org/scalacoin/script/interpreter/script_valid.json")
//use this to represent a single test case from script_valid.json //use this to represent a single test case from script_valid.json
val lines = /* val lines =
""" """
| |
|[[ |[[
@ -93,9 +93,9 @@ class ScriptInterpreterTest extends FlatSpec with MustMatchers with ScriptInterp
"P2SH", "P2SH",
"P2SH(2-of-3)" "P2SH(2-of-3)"
]] ]]
""".stripMargin """.stripMargin*/
//val lines = try source.getLines.filterNot(_.isEmpty).map(_.trim) mkString "\n" finally source.close() val lines = try source.getLines.filterNot(_.isEmpty).map(_.trim) mkString "\n" finally source.close()
val json = lines.parseJson val json = lines.parseJson
val testCasesOpt : Seq[Option[CoreTestCase]] = json.convertTo[Seq[Option[CoreTestCase]]] val testCasesOpt : Seq[Option[CoreTestCase]] = json.convertTo[Seq[Option[CoreTestCase]]]
val testCases : Seq[CoreTestCase] = testCasesOpt.flatten val testCases : Seq[CoreTestCase] = testCasesOpt.flatten