Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2026-02-21 03:03:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOD-641] Upgrade to github.com/pkg/errors v0.9.1 and use errors.As where needed (#614)

Browse Source 
* [NOD-641] Upgrade to github.com/pkg/errors v0.9.1 and use errors.As where needed

* [NOD-641] Fix find and replace error

* [NOD-641] Use errors.As for error type checking

* [NOD-641] Fix errors.As for pointer types

* [NOD-641] Use errors.As where needed

* [NOD-641] Rename rErr->ruleErr

* [NOD-641] Rename derr->dbErr

* [NOD-641] e->flagsErr where necessary

* [NOD-641] change jerr to more appropriate name

* [NOD-641] Rename cerr->bdRuleErr

* [NOD-641] Rename serr->scriptErr

* [NOD-641] Use errors.Is instead of testutil.AreErrorsEqual in TestNewHashFromStr

* [NOD-641] Rename bdRuleErr->dagRuleErr

* [NOD-641] Rename mErr->msgErr

* [NOD-641] Rename dErr->deserializeErr
This commit is contained in:
Ori Newman
2020-02-03 12:38:33 +02:00
committed by GitHub
parent 41c8178ad3
commit eb953286ec
65 changed files with 314 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
txscript/scriptbuilder_test.go
View File

@@ -6,6 +6,7 @@ package txscript
import (
"bytes"
"github.com/pkg/errors"
"testing"
)
@@ -300,7 +301,8 @@ func TestExceedMaxScriptSize(t *testing.T) {
// Ensure adding data that would exceed the maximum size of the script
// does not add the data.
script, err := builder.AddData([]byte{0x00}).Script()
if _, ok := err.(ErrScriptNotCanonical); !ok || err == nil {
var errScriptNotCanonical ErrScriptNotCanonical
if !errors.As(err, &errScriptNotCanonical) || err == nil {
t.Fatalf("ScriptBuilder.AddData allowed exceeding max script "+
"size: %v", len(script))
}
@@ -313,7 +315,7 @@ func TestExceedMaxScriptSize(t *testing.T) {
// script does not add the data.
builder.Reset().AddFullData(make([]byte, MaxScriptSize-3))
script, err = builder.AddOp(Op0).Script()
if _, ok := err.(ErrScriptNotCanonical); !ok || err == nil {
if !errors.As(err, &errScriptNotCanonical) || err == nil {
t.Fatalf("ScriptBuilder.AddOp unexpected modified script - "+
"got len %d, want len %d", len(script), len(origScript))
}
@@ -326,7 +328,7 @@ func TestExceedMaxScriptSize(t *testing.T) {
// script does not add the data.
builder.Reset().AddFullData(make([]byte, MaxScriptSize-3))
script, err = builder.AddInt64(0).Script()
if _, ok := err.(ErrScriptNotCanonical); !ok || err == nil {
if !errors.As(err, &errScriptNotCanonical) || err == nil {
t.Fatalf("ScriptBuilder.AddInt64 unexpected modified script - "+
"got len %d, want len %d", len(script), len(origScript))
}
@@ -351,7 +353,8 @@ func TestErroredScript(t *testing.T) {
t.Fatalf("ScriptBuilder.AddFullData unexpected error: %v", err)
}
script, err := builder.AddData([]byte{0x00, 0x00, 0x00, 0x00, 0x00}).Script()
if _, ok := err.(ErrScriptNotCanonical); !ok || err == nil {
var errScriptNotCanonical ErrScriptNotCanonical
if !errors.As(err, &errScriptNotCanonical) || err == nil {
t.Fatalf("ScriptBuilder.AddData allowed exceeding max script "+
"size: %v", len(script))
}
@@ -363,7 +366,7 @@ func TestErroredScript(t *testing.T) {
// Ensure adding data, even using the non-canonical path, to a script
// that has errored doesn't succeed.
script, err = builder.AddFullData([]byte{0x00}).Script()
if _, ok := err.(ErrScriptNotCanonical); !ok || err == nil {
if !errors.As(err, &errScriptNotCanonical) || err == nil {
t.Fatal("ScriptBuilder.AddFullData succeeded on errored script")
}
if !bytes.Equal(script, origScript) {
@@ -374,7 +377,7 @@ func TestErroredScript(t *testing.T) {
// Ensure adding data to a script that has errored doesn't succeed.
script, err = builder.AddData([]byte{0x00}).Script()
if _, ok := err.(ErrScriptNotCanonical); !ok || err == nil {
if !errors.As(err, &errScriptNotCanonical) || err == nil {
t.Fatal("ScriptBuilder.AddData succeeded on errored script")
}
if !bytes.Equal(script, origScript) {
@@ -385,7 +388,7 @@ func TestErroredScript(t *testing.T) {
// Ensure adding an opcode to a script that has errored doesn't succeed.
script, err = builder.AddOp(Op0).Script()
if _, ok := err.(ErrScriptNotCanonical); !ok || err == nil {
if !errors.As(err, &errScriptNotCanonical) || err == nil {
t.Fatal("ScriptBuilder.AddOp succeeded on errored script")
}
if !bytes.Equal(script, origScript) {
@@ -396,7 +399,7 @@ func TestErroredScript(t *testing.T) {
// Ensure adding an integer to a script that has errored doesn't
// succeed.
script, err = builder.AddInt64(0).Script()
if _, ok := err.(ErrScriptNotCanonical); !ok || err == nil {
if !errors.As(err, &errScriptNotCanonical) || err == nil {
t.Fatal("ScriptBuilder.AddInt64 succeeded on errored script")
}
if !bytes.Equal(script, origScript) {