Add tests for new nulldata standard script type.

script_test.go

@@ -2007,7 +2007,77 @@ var scriptTypeTests = []scriptTypeTest{
 		},
 		scripttype: btcscript.ScriptHashTy,
 	},
-	// The next few are almost multisig (it is the more complex script type)
+	// Nulldata with no data at all.
+	scriptTypeTest{
+		name: "nulldata",
+		script: []byte{
+			btcscript.OP_RETURN,
+		},
+		scripttype: btcscript.NullDataTy,
+	},
+	// Nulldata with small data.
+	scriptTypeTest{
+		name: "nulldata2",
+		script: []byte{
+			btcscript.OP_RETURN,
+			btcscript.OP_DATA_8,
+			0x04, 0x67, 0x08, 0xaf, 0xdb, 0x0f, 0xe5, 0x54,
+		},
+		scripttype: btcscript.NullDataTy,
+	},
+	// Nulldata with max allowed data.
+	scriptTypeTest{
+		name: "nulldata3",
+		script: []byte{
+			btcscript.OP_RETURN,
+			btcscript.OP_PUSHDATA1,
+			0x50,
+			0x04, 0x67, 0x08, 0xaf, 0xdb, 0x0f, 0xe5, 0x54,
+			0x82, 0x71, 0x96, 0x7f, 0x1a, 0x67, 0x13, 0x0b,
+			0x71, 0x05, 0xcd, 0x6a, 0x82, 0x8e, 0x03, 0x90,
+			0x9a, 0x67, 0x96, 0x2e, 0x0e, 0xa1, 0xf6, 0x1d,
+			0xeb, 0x64, 0x9f, 0x6b, 0xc3, 0xf4, 0xce, 0xf3,
+			0x80, 0x46, 0x78, 0xaf, 0xdb, 0x0f, 0xe5, 0x54,
+			0x82, 0x71, 0x96, 0x7f, 0x1a, 0x67, 0x13, 0x0b,
+			0x71, 0x05, 0xcd, 0x6a, 0x82, 0x8e, 0x03, 0x90,
+			0x9a, 0x67, 0x96, 0x2e, 0x0e, 0xa1, 0xf6, 0x1d,
+			0xeb, 0x64, 0x9f, 0x6b, 0xc3, 0xf4, 0xce, 0xf3,
+		},
+		scripttype: btcscript.NullDataTy,
+	},
+	// Nulldata with more than max allowed data (so therefore nonstandard)
+	scriptTypeTest{
+		name: "nulldata4",
+		script: []byte{
+			btcscript.OP_RETURN,
+			btcscript.OP_PUSHDATA1,
+			0x51,
+			0x04, 0x67, 0x08, 0xaf, 0xdb, 0x0f, 0xe5, 0x54,
+			0x82, 0x71, 0x96, 0x7f, 0x1a, 0x67, 0x13, 0x0b,
+			0x71, 0x05, 0xcd, 0x6a, 0x82, 0x8e, 0x03, 0x90,
+			0x9a, 0x67, 0x96, 0x2e, 0x0e, 0xa1, 0xf6, 0x1d,
+			0xeb, 0x64, 0x9f, 0x6b, 0xc3, 0xf4, 0xce, 0xf3,
+			0x80, 0x46, 0x78, 0xaf, 0xdb, 0x0f, 0xe5, 0x54,
+			0x82, 0x71, 0x96, 0x7f, 0x1a, 0x67, 0x13, 0x0b,
+			0x71, 0x05, 0xcd, 0x6a, 0x82, 0x8e, 0x03, 0x90,
+			0x9a, 0x67, 0x96, 0x2e, 0x0e, 0xa1, 0xf6, 0x1d,
+			0xeb, 0x64, 0x9f, 0x6b, 0xc3, 0xf4, 0xce, 0xf3,
+			0x08,
+		},
+		scripttype: btcscript.NonStandardTy,
+	},
+	// Almost nulldata, but add an additional opcode after the data to make
+	// it nonstandard.
+	scriptTypeTest{
+		name: "nulldata5",
+		script: []byte{
+			btcscript.OP_RETURN,
+			btcscript.OP_DATA_1,
+			0x04,
+			btcscript.OP_TRUE,
+		},
+		scripttype: btcscript.NonStandardTy,
+	}, // The next few are almost multisig (it is the more complex script type)
 	// but with various changes to make it fail.
 	scriptTypeTest{
 		// multisig but funny nsigs..
@@ -2695,6 +2765,11 @@ var classStringifyTests = []struct {
 		scriptclass: btcscript.MultiSigTy,
 		stringed:    "multisig",
 	},
+	{
+		name:        "nulldataty",
+		scriptclass: btcscript.NullDataTy,
+		stringed:    "nulldata",
+	},
 	{
 		name:        "broken",
 		scriptclass: btcscript.ScriptClass(255),

test_coverage.txt

@@ -8,17 +8,18 @@ github.com/conformal/btcscript/script.go	 sigDER				 100.00% (22/22)
 github.com/conformal/btcscript/script.go	 NewScript			 100.00% (21/21)
 github.com/conformal/btcscript/stack.go		 asInt				 100.00% (21/21)
 github.com/conformal/btcscript/script.go	 signatureScriptCustomReader	 100.00% (15/15)
-github.com/conformal/btcscript/stack.go		 fromInt			 100.00% (14/14)
 github.com/conformal/btcscript/stack.go		 Stack.nipN			 100.00% (14/14)
-github.com/conformal/btcscript/script.go	 GetPreciseSigOpCount		 100.00% (13/13)
+github.com/conformal/btcscript/stack.go		 fromInt			 100.00% (14/14)
-github.com/conformal/btcscript/opcode.go	 opcodeWithin			 100.00% (13/13)
 github.com/conformal/btcscript/script.go	 isMultiSig			 100.00% (13/13)
+github.com/conformal/btcscript/opcode.go	 opcodeWithin			 100.00% (13/13)
+github.com/conformal/btcscript/script.go	 GetPreciseSigOpCount		 100.00% (13/13)
 github.com/conformal/btcscript/opcode.go	 parsedOpcode.print		 100.00% (12/12)
 github.com/conformal/btcscript/opcode.go	 opcodeNotIf			 100.00% (11/11)
 github.com/conformal/btcscript/opcode.go	 opcodeIf			 100.00% (11/11)
-github.com/conformal/btcscript/opcode.go	 opcodeMax			 100.00% (10/10)
+github.com/conformal/btcscript/opcode.go	 opcodeMin			 100.00% (10/10)
 github.com/conformal/btcscript/script.go	 getSigOpCount			 100.00% (10/10)
 github.com/conformal/btcscript/stack.go		 Stack.Tuck			 100.00% (10/10)
+github.com/conformal/btcscript/opcode.go	 opcodeMax			 100.00% (10/10)
 github.com/conformal/btcscript/opcode.go	 opcodeBoolAnd			 100.00% (10/10)
 github.com/conformal/btcscript/opcode.go	 opcodeBoolOr			 100.00% (10/10)
 github.com/conformal/btcscript/opcode.go	 opcodeNumEqual			 100.00% (10/10)
@@ -27,36 +28,33 @@ github.com/conformal/btcscript/opcode.go	 opcodeLessThan			 100.00% (10/10)
 github.com/conformal/btcscript/opcode.go	 opcodeGreaterThan		 100.00% (10/10)
 github.com/conformal/btcscript/opcode.go	 opcodeLessThanOrEqual		 100.00% (10/10)
 github.com/conformal/btcscript/opcode.go	 opcodeGreaterThanOrEqual	 100.00% (10/10)
-github.com/conformal/btcscript/opcode.go	 opcodeMin			 100.00% (10/10)
 github.com/conformal/btcscript/stack.go		 Stack.RotN			 100.00% (9/9)
 github.com/conformal/btcscript/stack.go		 Stack.OverN			 100.00% (9/9)
 github.com/conformal/btcscript/stack.go		 Stack.SwapN			 100.00% (9/9)
 github.com/conformal/btcscript/script.go	 DisasmString			 100.00% (9/9)
-github.com/conformal/btcscript/stack.go		 Stack.DupN			 100.00% (8/8)
-github.com/conformal/btcscript/opcode.go	 opcodeSub			 100.00% (8/8)
-github.com/conformal/btcscript/opcode.go	 opcodeAdd			 100.00% (8/8)
 github.com/conformal/btcscript/opcode.go	 opcodeEqual			 100.00% (8/8)
-github.com/conformal/btcscript/stack.go		 Stack.DropN			 100.00% (7/7)
+github.com/conformal/btcscript/opcode.go	 opcodeAdd			 100.00% (8/8)
+github.com/conformal/btcscript/opcode.go	 opcodeSub			 100.00% (8/8)
+github.com/conformal/btcscript/stack.go		 Stack.DupN			 100.00% (8/8)
+github.com/conformal/btcscript/script.go	 unparseScript			 100.00% (7/7)
 github.com/conformal/btcscript/opcode.go	 opcodeRoll			 100.00% (7/7)
 github.com/conformal/btcscript/opcode.go	 opcodeNot			 100.00% (7/7)
 github.com/conformal/btcscript/opcode.go	 opcode0NotEqual		 100.00% (7/7)
 github.com/conformal/btcscript/opcode.go	 opcodePick			 100.00% (7/7)
-github.com/conformal/btcscript/script.go	 unparseScript			 100.00% (7/7)
+github.com/conformal/btcscript/script.go	 typeOfScript			 100.00% (7/7)
+github.com/conformal/btcscript/stack.go		 Stack.DropN			 100.00% (7/7)
 github.com/conformal/btcscript/opcode.go	 opcodeElse			 100.00% (6/6)
+github.com/conformal/btcscript/opcode.go	 opcodeVerify			 100.00% (6/6)
 github.com/conformal/btcscript/opcode.go	 opcodeEndif			 100.00% (6/6)
 github.com/conformal/btcscript/opcode.go	 parsedOpcode.conditional	 100.00% (6/6)
-github.com/conformal/btcscript/script.go	 typeOfScript			 100.00% (6/6)
-github.com/conformal/btcscript/opcode.go	 opcodeVerify			 100.00% (6/6)
-github.com/conformal/btcscript/script.go	 expectedInputs			 100.00% (6/6)
 github.com/conformal/btcscript/opcode.go	 opcodeIfDup			 100.00% (6/6)
 github.com/conformal/btcscript/opcode.go	 opcodeFromAltStack		 100.00% (5/5)
-github.com/conformal/btcscript/script.go	 removeOpcodeByData		 100.00% (5/5)
-github.com/conformal/btcscript/opcode.go	 opcodeSha1			 100.00% (5/5)
 github.com/conformal/btcscript/stack.go		 Stack.RollN			 100.00% (5/5)
 github.com/conformal/btcscript/stack.go		 Stack.PickN			 100.00% (5/5)
-github.com/conformal/btcscript/opcode.go	 opcodeHash160			 100.00% (5/5)
+github.com/conformal/btcscript/opcode.go	 opcodeSha1			 100.00% (5/5)
-github.com/conformal/btcscript/script.go	 Script.DisasmScript		 100.00% (5/5)
+github.com/conformal/btcscript/script.go	 Script.validPC			 100.00% (5/5)
 github.com/conformal/btcscript/opcode.go	 opcodeHash256			 100.00% (5/5)
+github.com/conformal/btcscript/opcode.go	 opcodeHash160			 100.00% (5/5)
 github.com/conformal/btcscript/opcode.go	 opcodeSha256			 100.00% (5/5)
 github.com/conformal/btcscript/opcode.go	 opcodeSize			 100.00% (5/5)
 github.com/conformal/btcscript/opcode.go	 opcodeRipemd160		 100.00% (5/5)
@@ -64,10 +62,12 @@ github.com/conformal/btcscript/opcode.go	 opcode1Add			 100.00% (5/5)
 github.com/conformal/btcscript/opcode.go	 opcode1Sub			 100.00% (5/5)
 github.com/conformal/btcscript/opcode.go	 opcodeNegate			 100.00% (5/5)
 github.com/conformal/btcscript/opcode.go	 opcodeAbs			 100.00% (5/5)
-github.com/conformal/btcscript/script.go	 Script.validPC			 100.00% (5/5)
-github.com/conformal/btcscript/opcode.go	 parsedOpcode.exec		 100.00% (5/5)
 github.com/conformal/btcscript/script.go	 removeOpcode			 100.00% (5/5)
+github.com/conformal/btcscript/script.go	 Script.DisasmScript		 100.00% (5/5)
+github.com/conformal/btcscript/opcode.go	 parsedOpcode.exec		 100.00% (5/5)
+github.com/conformal/btcscript/script.go	 removeOpcodeByData		 100.00% (5/5)
 github.com/conformal/btcscript/opcode.go	 opcodeToAltStack		 100.00% (5/5)
+github.com/conformal/btcscript/stack.go		 Stack.PeekBool			 100.00% (4/4)
 github.com/conformal/btcscript/opcode.go	 opcodePushData			 100.00% (4/4)
 github.com/conformal/btcscript/opcode.go	 opcodeEqualVerify		 100.00% (4/4)
 github.com/conformal/btcscript/opcode.go	 opcodeNumEqualVerify		 100.00% (4/4)
@@ -77,43 +77,43 @@ github.com/conformal/btcscript/stack.go		 asBool				 100.00% (4/4)
 github.com/conformal/btcscript/stack.go		 Stack.PeekByteArray		 100.00% (4/4)
 github.com/conformal/btcscript/stack.go		 Stack.PeekInt			 100.00% (4/4)
 github.com/conformal/btcscript/stack.go		 Stack.PopInt			 100.00% (4/4)
+github.com/conformal/btcscript/script.go	 IsPayToScriptHash		 100.00% (4/4)
+github.com/conformal/btcscript/script.go	 isNullData			 100.00% (4/4)
 github.com/conformal/btcscript/script.go	 isPushOnly			 100.00% (4/4)
 github.com/conformal/btcscript/script.go	 GetScriptClass			 100.00% (4/4)
 github.com/conformal/btcscript/script.go	 Script.curPC			 100.00% (4/4)
 github.com/conformal/btcscript/script.go	 Script.DisasmPC		 100.00% (4/4)
-github.com/conformal/btcscript/stack.go		 Stack.PeekBool			 100.00% (4/4)
 github.com/conformal/btcscript/script.go	 getStack			 100.00% (4/4)
-github.com/conformal/btcscript/script.go	 IsPayToScriptHash		 100.00% (4/4)
 github.com/conformal/btcscript/script.go	 scriptUInt8			 100.00% (3/3)
-github.com/conformal/btcscript/script.go	 setStack			 100.00% (3/3)
-github.com/conformal/btcscript/stack.go		 fromBool			 100.00% (3/3)
-github.com/conformal/btcscript/script.go	 scriptUInt16			 100.00% (3/3)
 github.com/conformal/btcscript/script.go	 scriptUInt32			 100.00% (3/3)
-github.com/conformal/btcscript/address.go	 ScriptType.String		 100.00% (3/3)
 github.com/conformal/btcscript/script.go	 ScriptClass.String		 100.00% (3/3)
+github.com/conformal/btcscript/address.go	 ScriptType.String		 100.00% (3/3)
+github.com/conformal/btcscript/script.go	 setStack			 100.00% (3/3)
+github.com/conformal/btcscript/script.go	 scriptUInt16			 100.00% (3/3)
+github.com/conformal/btcscript/stack.go		 fromBool			 100.00% (3/3)
 github.com/conformal/btcscript/stack.go		 Stack.NipN			 100.00% (2/2)
-github.com/conformal/btcscript/address.go	 ScriptToAddrHash		 100.00% (2/2)
+github.com/conformal/btcscript/stack.go		 Stack.Depth			 100.00% (2/2)
-github.com/conformal/btcscript/script.go	 GetSigOpCount			 100.00% (2/2)
 github.com/conformal/btcscript/opcode.go	 calcHash			 100.00% (2/2)
+github.com/conformal/btcscript/address.go	 ScriptToAddrHash		 100.00% (2/2)
+github.com/conformal/btcscript/opcode.go	 opcode1Negate			 100.00% (2/2)
+github.com/conformal/btcscript/opcode.go	 opcodeDepth			 100.00% (2/2)
 github.com/conformal/btcscript/opcode.go	 opcodeCodeSeparator		 100.00% (2/2)
 github.com/conformal/btcscript/script.go	 PayToPubKeyHashScript		 100.00% (2/2)
-github.com/conformal/btcscript/opcode.go	 opcodeDepth			 100.00% (2/2)
+github.com/conformal/btcscript/script.go	 GetSigOpCount			 100.00% (2/2)
-github.com/conformal/btcscript/opcode.go	 opcodeN			 100.00% (2/2)
-github.com/conformal/btcscript/opcode.go	 opcode1Negate			 100.00% (2/2)
-github.com/conformal/btcscript/stack.go		 Stack.Depth			 100.00% (2/2)
 github.com/conformal/btcscript/opcode.go	 opcodeFalse			 100.00% (2/2)
+github.com/conformal/btcscript/opcode.go	 opcodeN			 100.00% (2/2)
+github.com/conformal/btcscript/script.go	 isPubkeyHash			 100.00% (1/1)
 github.com/conformal/btcscript/script.go	 isScriptHash			 100.00% (1/1)
 github.com/conformal/btcscript/script.go	 SignatureScript		 100.00% (1/1)
+github.com/conformal/btcscript/log.go		 DisableLog			 100.00% (1/1)
+github.com/conformal/btcscript/opcode.go	 opcodeDisabled			 100.00% (1/1)
+github.com/conformal/btcscript/log.go		 init				 100.00% (1/1)
 github.com/conformal/btcscript/script.go	 parseScript			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcodeInvalid			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcodeReserved			 100.00% (1/1)
-github.com/conformal/btcscript/log.go		 UseLogger			 100.00% (1/1)
-github.com/conformal/btcscript/opcode.go	 opcodeDisabled			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 init				 100.00% (1/1)
-github.com/conformal/btcscript/log.go		 DisableLog			 100.00% (1/1)
-github.com/conformal/btcscript/script.go	 Script.disasm			 100.00% (1/1)
 github.com/conformal/btcscript/log.go		 newLogClosure			 100.00% (1/1)
-github.com/conformal/btcscript/log.go		 init				 100.00% (1/1)
+github.com/conformal/btcscript/script.go	 Script.disasm			 100.00% (1/1)
 github.com/conformal/btcscript/script.go	 Script.GetAltStack		 100.00% (1/1)
 github.com/conformal/btcscript/stack.go		 Stack.PopByteArray		 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcodeNip			 100.00% (1/1)
@@ -123,15 +123,15 @@ github.com/conformal/btcscript/opcode.go	 opcodeDrop			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcode2Swap			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcode2Rot			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcode2Over			 100.00% (1/1)
+github.com/conformal/btcscript/log.go		 UseLogger			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcode3Dup			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcode2Dup			 100.00% (1/1)
+github.com/conformal/btcscript/opcode.go	 opcode2Drop			 100.00% (1/1)
 github.com/conformal/btcscript/stack.go		 Stack.PushBool			 100.00% (1/1)
 github.com/conformal/btcscript/script.go	 Script.subScript		 100.00% (1/1)
-github.com/conformal/btcscript/opcode.go	 opcode2Drop			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcodeReturn			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcodeNop			 100.00% (1/1)
 github.com/conformal/btcscript/script.go	 isPubkey			 100.00% (1/1)
-github.com/conformal/btcscript/script.go	 isPubkeyHash			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcodeOver			 100.00% (1/1)
 github.com/conformal/btcscript/script.go	 Script.GetStack		 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 calcHash160			 100.00% (1/1)
@@ -142,7 +142,8 @@ github.com/conformal/btcscript/stack.go		 Stack.PushByteArray		 100.00% (1/1)
 github.com/conformal/btcscript/stack.go		 Stack.PushInt			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcodeRot			 100.00% (1/1)
 github.com/conformal/btcscript/opcode.go	 opcodeCheckMultiSig		 98.28% (57/58)
-github.com/conformal/btcscript/opcode.go	 opcodeCheckSig			 96.55% (28/29)
+github.com/conformal/btcscript/opcode.go	 opcodeCheckSig			 90.62% (29/32)
+github.com/conformal/btcscript/script.go	 expectedInputs			 85.71% (6/7)
 github.com/conformal/btcscript/script.go	 calcScriptHash			 82.05% (32/39)
 github.com/conformal/btcscript/script.go	 Script.CheckErrorCondition	 78.57% (11/14)
 github.com/conformal/btcscript/opcode.go	 opcodeCheckSigVerify		 75.00% (3/4)
@@ -150,5 +151,5 @@ github.com/conformal/btcscript/script.go	 Script.Execute			 44.44% (8/18)
 github.com/conformal/btcscript/log.go		 SetLogWriter			 0.00% (0/7)
 github.com/conformal/btcscript/script.go	 IsPushOnlyScript		 0.00% (0/4)
 github.com/conformal/btcscript/log.go		 logClosure.String		 0.00% (0/1)
-github.com/conformal/btcscript			 ---------------------------	 96.59% (992/1027)
+github.com/conformal/btcscript			 ---------------------------	 96.33% (998/1036)