Merge pull request #10 from ordishs/master

bscript/script.go

@@ -198,9 +198,7 @@ func (s *Script) ToString() string { // TODO: change to HexString?
 // ToASM returns the string ASM opcodes of the script.
 func (s *Script) ToASM() (string, error) {
 	parts, err := DecodeParts(*s)
-	if err != nil {
-		return "", err
-	}
+	// if err != nil, we will append [error] to the ASM script below (as done in the node).
 
 	var asmScript string
 	for _, p := range parts {
@@ -211,6 +209,10 @@ func (s *Script) ToASM() (string, error) {
 		}
 	}
 
+	if err != nil {
+		asmScript += " [error]"
+	}
+
 	return strings.TrimSpace(asmScript), nil
 }
 

bscript/script_test.go

@@ -2,6 +2,7 @@ package bscript_test
 
 import (
 	"encoding/hex"
+	"strings"
 	"testing"
 
 	"github.com/bitcoinsv/bsvd/bsvec"
@@ -170,3 +171,12 @@ func TestScript_GetPublicKeyHash(t *testing.T) {
 		assert.EqualError(t, err, "script is empty")
 	})
 }
+
+func TestErrorIsAppended(t *testing.T) {
+	script, _ := hex.DecodeString("6a0548656c6c6f0548656c6c")
+	s := bscript.Script(script)
+
+	asm, err := s.ToASM()
+	assert.NoError(t, err)
+	assert.True(t, strings.HasSuffix(asm, "[error]"), "toASM() should end with [error]")
+}