Skip to content

txscript: Break dcrutil dependency. #2626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davecgh merged 1 commit into from
Apr 12, 2021
Merged

txscript: Break dcrutil dependency. #2626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hdkeychain/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ github.com/decred/dcrd/dcrec v1.0.0 h1:W+z6Es+Rai3MXYVoPAxYr5U1DGis0Co33scJ6uH2J
github.com/decred/dcrd/dcrec v1.0.0/go.mod h1:HIaqbEJQ+PDzQcORxnqen5/V1FR3B4VpIfmePklt8Q8=
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.1 h1:V6eqU1crZzuoFT4KG2LhaU5xDSdkHuvLQsj25wd7Wb4=
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.1/go.mod h1:d0H8xGMWbiIQP7gN3v2rByWUcuZPm9YsgmnfoxgbINc=
github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210129181600-6ae0142d3b28/go.mod h1:xe59jKcMx5G/dbRmsZ8+FzY+WQDE/7YBP3k3uzJTtmI=
github.com/decred/dcrd/wire v1.4.0 h1:KmSo6eTQIvhXS0fLBQ/l7hG7QLcSJQKSwSyzSqJYDk0=
github.com/decred/dcrd/wire v1.4.0/go.mod h1:WxC/0K+cCAnBh+SKsRjIX9YPgvrjhmE+6pZlel1G7Ro=
github.com/decred/slog v1.1.0/go.mod h1:kVXlGnt6DHy2fV5OjSeuvCJ0OmlmTF6LFpEPMu/fOY0=
6 changes: 1 addition & 5 deletions txscript/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ require (
github.com/decred/dcrd/dcrec v1.0.0
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.1
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210127014238-b33b46cf1a24
github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210129181600-6ae0142d3b28
github.com/decred/dcrd/wire v1.4.0
github.com/decred/slog v1.1.0
)

replace (
github.com/decred/dcrd/dcrec/secp256k1/v4 => ../dcrec/secp256k1
github.com/decred/dcrd/dcrutil/v4 => ../dcrutil
)
replace github.com/decred/dcrd/dcrec/secp256k1/v4 => ../dcrec/secp256k1
29 changes: 12 additions & 17 deletions txscript/reference_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"testing"

"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/wire"
)

Expand Down Expand Up @@ -559,10 +558,9 @@ testloop:
continue
}

tx, err := dcrutil.NewTxFromBytes(serializedTx)
if err != nil {
t.Errorf("bad test (arg 2 not msgtx %v) %d: %v", err,
i, test)
var tx wire.MsgTx
if err := tx.Deserialize(bytes.NewReader(serializedTx)); err != nil {
t.Errorf("bad test (arg 2 not msgtx %v) %d: %v", err, i, test)
continue
}

Expand Down Expand Up @@ -632,8 +630,8 @@ testloop:
prevOuts[*wire.NewOutPoint(prevhash, idx, wire.TxTreeRegular)] = script
}

for k, txin := range tx.MsgTx().TxIn {
pkScript, ok := prevOuts[txin.PreviousOutPoint]
for k, txIn := range tx.TxIn {
pkScript, ok := prevOuts[txIn.PreviousOutPoint]
if !ok {
t.Errorf("bad test (missing %dth input) %d:%v",
k, i, test)
Expand All @@ -642,8 +640,7 @@ testloop:
// These are meant to fail, so as soon as the first
// input fails the transaction has failed. (some of the
// test txns have good inputs, too..
vm, err := NewEngine(pkScript, tx.MsgTx(), k, flags, 0,
nil)
vm, err := NewEngine(pkScript, &tx, k, flags, 0, nil)
if err != nil {
continue testloop
}
Expand Down Expand Up @@ -701,10 +698,9 @@ testloop:
continue
}

tx, err := dcrutil.NewTxFromBytes(serializedTx)
if err != nil {
t.Errorf("bad test (arg 2 not msgtx %v) %d: %v", err,
i, test)
var tx wire.MsgTx
if err := tx.Deserialize(bytes.NewReader(serializedTx)); err != nil {
t.Errorf("bad test (arg 2 not msgtx %v) %d: %v", err, i, test)
continue
}

Expand Down Expand Up @@ -774,15 +770,14 @@ testloop:
prevOuts[*wire.NewOutPoint(prevhash, idx, wire.TxTreeRegular)] = script
}

for k, txin := range tx.MsgTx().TxIn {
pkScript, ok := prevOuts[txin.PreviousOutPoint]
for k, txIn := range tx.TxIn {
pkScript, ok := prevOuts[txIn.PreviousOutPoint]
if !ok {
t.Errorf("bad test (missing %dth input) %d:%v",
k, i, test)
continue testloop
}
vm, err := NewEngine(pkScript, tx.MsgTx(), k, flags, 0,
nil)
vm, err := NewEngine(pkScript, &tx, k, flags, 0, nil)
if err != nil {
t.Errorf("test (%d:%v:%d) failed to create "+
"script: %v", i, test, k, err)
Expand Down