LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

blockchain: Run gofmt -s.

Browse source 
Also compress some definitions a bit while simplifying.
This commit is contained in:
Dave Collins 2016-10-27 23:16:07 -05:00
parent f3c442deb2
commit 51a6309cdd
No known key found for this signature in database
GPG key ID: B8904D9D9C93D1F2
1 changed files with 73 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

179
blockchain/chain_test.go
View file

@ -186,12 +186,10 @@ func TestCalcSequenceLock(t *testing.T) {
// output. // output.
var fakeScript []byte var fakeScript []byte
unConfTx := &wire.MsgTx{ unConfTx := &wire.MsgTx{
TxOut: []*wire.TxOut{ TxOut: []*wire.TxOut{{
&wire.TxOut{ PkScript: fakeScript,
PkScript: fakeScript, Value: 5,
Value: 5, }},
},
},
} }
unConfUtxo := wire.OutPoint{ unConfUtxo := wire.OutPoint{
Hash: unConfTx.TxHash(), Hash: unConfTx.TxHash(),
@ -202,11 +200,9 @@ func TestCalcSequenceLock(t *testing.T) {
utxoView.AddTxOuts(btcutil.NewTx(unConfTx), 0x7fffffff) utxoView.AddTxOuts(btcutil.NewTx(unConfTx), 0x7fffffff)
tests := []struct { tests := []struct {
tx *btcutil.Tx tx *btcutil.Tx
view *blockchain.UtxoViewpoint view *blockchain.UtxoViewpoint
want *blockchain.SequenceLock
want *blockchain.SequenceLock
mempool bool mempool bool
}{ }{
// A transaction of version one should disable sequence locks // A transaction of version one should disable sequence locks
@ -215,12 +211,10 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 1, Version: 1,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: utxo,
PreviousOutPoint: utxo, Sequence: blockchain.LockTimeToSequence(false, 3),
Sequence: blockchain.LockTimeToSequence(false, 3), }},
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -234,12 +228,10 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: utxo,
PreviousOutPoint: utxo, Sequence: wire.MaxTxInSequenceNum,
Sequence: wire.MaxTxInSequenceNum, }},
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -256,12 +248,10 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: utxo,
PreviousOutPoint: utxo, Sequence: blockchain.LockTimeToSequence(true, 2),
Sequence: blockchain.LockTimeToSequence(true, 2), }},
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -276,12 +266,10 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: utxo,
PreviousOutPoint: utxo, Sequence: blockchain.LockTimeToSequence(true, 1024),
Sequence: blockchain.LockTimeToSequence(true, 1024), }},
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -298,21 +286,17 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: utxo,
PreviousOutPoint: utxo, Sequence: blockchain.LockTimeToSequence(true, 2560),
Sequence: blockchain.LockTimeToSequence(true, 2560), }, {
}, PreviousOutPoint: utxo,
&wire.TxIn{ Sequence: blockchain.LockTimeToSequence(false, 3) |
PreviousOutPoint: utxo, wire.SequenceLockTimeDisabled,
Sequence: blockchain.LockTimeToSequence(false, 3) | }, {
wire.SequenceLockTimeDisabled, PreviousOutPoint: utxo,
}, Sequence: blockchain.LockTimeToSequence(false, 3),
&wire.TxIn{ }},
PreviousOutPoint: utxo,
Sequence: blockchain.LockTimeToSequence(false, 3),
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -328,12 +312,10 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: utxo,
PreviousOutPoint: utxo, Sequence: blockchain.LockTimeToSequence(false, 3),
Sequence: blockchain.LockTimeToSequence(false, 3), }},
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -347,16 +329,13 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: utxo,
PreviousOutPoint: utxo, Sequence: blockchain.LockTimeToSequence(true, 5120),
Sequence: blockchain.LockTimeToSequence(true, 5120), }, {
}, PreviousOutPoint: utxo,
&wire.TxIn{ Sequence: blockchain.LockTimeToSequence(true, 2560),
PreviousOutPoint: utxo, }},
Sequence: blockchain.LockTimeToSequence(true, 2560),
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -371,16 +350,13 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: utxo,
PreviousOutPoint: utxo, Sequence: blockchain.LockTimeToSequence(false, 1),
Sequence: blockchain.LockTimeToSequence(false, 1), }, {
}, PreviousOutPoint: utxo,
&wire.TxIn{ Sequence: blockchain.LockTimeToSequence(false, 7),
PreviousOutPoint: utxo, }},
Sequence: blockchain.LockTimeToSequence(false, 7),
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -395,24 +371,19 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: utxo,
PreviousOutPoint: utxo, Sequence: blockchain.LockTimeToSequence(true, 2560),
Sequence: blockchain.LockTimeToSequence(true, 2560), }, {
}, PreviousOutPoint: utxo,
&wire.TxIn{ Sequence: blockchain.LockTimeToSequence(true, 6656),
PreviousOutPoint: utxo, }, {
Sequence: blockchain.LockTimeToSequence(true, 6656), PreviousOutPoint: utxo,
}, Sequence: blockchain.LockTimeToSequence(false, 3),
&wire.TxIn{ }, {
PreviousOutPoint: utxo, PreviousOutPoint: utxo,
Sequence: blockchain.LockTimeToSequence(false, 3), Sequence: blockchain.LockTimeToSequence(false, 9),
}, }},
&wire.TxIn{
PreviousOutPoint: utxo,
Sequence: blockchain.LockTimeToSequence(false, 9),
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -428,12 +399,10 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: unConfUtxo,
PreviousOutPoint: unConfUtxo, Sequence: blockchain.LockTimeToSequence(false, 2),
Sequence: blockchain.LockTimeToSequence(false, 2), }},
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{
@ -447,12 +416,10 @@ func TestCalcSequenceLock(t *testing.T) {
{ {
tx: btcutil.NewTx(&wire.MsgTx{ tx: btcutil.NewTx(&wire.MsgTx{
Version: 2, Version: 2,
TxIn: []*wire.TxIn{ TxIn: []*wire.TxIn{{
&wire.TxIn{ PreviousOutPoint: unConfUtxo,
PreviousOutPoint: unConfUtxo, Sequence: blockchain.LockTimeToSequence(true, 1024),
Sequence: blockchain.LockTimeToSequence(true, 1024), }},
},
},
}), }),
view: utxoView, view: utxoView,
want: &blockchain.SequenceLock{ want: &blockchain.SequenceLock{