LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

wtxmgr/tx_test: move store teardown after error check

Browse source
This commit is contained in:
Wilmer Paulino 2018-08-29 17:02:52 -07:00
parent 7b84dc25a6
commit a71881aed8
No known key found for this signature in database
GPG key ID: 6DF57B9F9514972F
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
wtxmgr/tx_test.go
View file

@ -64,17 +64,18 @@ func testStore() (*Store, walletdb.DB, func(), error) {
if err != nil { if err != nil {
return nil, nil, func() {}, err return nil, nil, func() {}, err
} }
db, err := walletdb.Create("bdb", filepath.Join(tmpDir, "db")) db, err := walletdb.Create("bdb", filepath.Join(tmpDir, "db"))
if err != nil { if err != nil {
teardown := func() {
os.RemoveAll(tmpDir) os.RemoveAll(tmpDir)
return nil, nil, nil, err
} }
return nil, nil, teardown, err
}
teardown := func() { teardown := func() {
db.Close() db.Close()
os.RemoveAll(tmpDir) os.RemoveAll(tmpDir)
} }
var s *Store var s *Store
err = walletdb.Update(db, func(tx walletdb.ReadWriteTx) error { err = walletdb.Update(db, func(tx walletdb.ReadWriteTx) error {
ns, err := tx.CreateTopLevelBucket(namespaceKey) ns, err := tx.CreateTopLevelBucket(namespaceKey)
@ -88,6 +89,7 @@ func testStore() (*Store, walletdb.DB, func(), error) {
s, err = Open(ns, &chaincfg.TestNet3Params) s, err = Open(ns, &chaincfg.TestNet3Params)
return err return err
}) })
return s, db, teardown, err return s, db, teardown, err
} }
@ -489,10 +491,10 @@ func TestInsertsCreditsDebitsRollbacks(t *testing.T) {
} }
s, db, teardown, err := testStore() s, db, teardown, err := testStore()
defer teardown()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer teardown()
for _, test := range tests { for _, test := range tests {
err := walletdb.Update(db, func(tx walletdb.ReadWriteTx) error { err := walletdb.Update(db, func(tx walletdb.ReadWriteTx) error {
@ -560,10 +562,10 @@ func TestFindingSpentCredits(t *testing.T) {
t.Parallel() t.Parallel()
s, db, teardown, err := testStore() s, db, teardown, err := testStore()
defer teardown()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer teardown()
dbtx, err := db.BeginReadWriteTx() dbtx, err := db.BeginReadWriteTx()
if err != nil { if err != nil {
@ -667,10 +669,10 @@ func TestCoinbases(t *testing.T) {
t.Parallel() t.Parallel()
s, db, teardown, err := testStore() s, db, teardown, err := testStore()
defer teardown()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer teardown()
dbtx, err := db.BeginReadWriteTx() dbtx, err := db.BeginReadWriteTx()
if err != nil { if err != nil {
@ -1073,10 +1075,10 @@ func TestMoveMultipleToSameBlock(t *testing.T) {
t.Parallel() t.Parallel()
s, db, teardown, err := testStore() s, db, teardown, err := testStore()
defer teardown()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer teardown()
dbtx, err := db.BeginReadWriteTx() dbtx, err := db.BeginReadWriteTx()
if err != nil { if err != nil {
@ -1250,10 +1252,10 @@ func TestInsertUnserializedTx(t *testing.T) {
t.Parallel() t.Parallel()
s, db, teardown, err := testStore() s, db, teardown, err := testStore()
defer teardown()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer teardown()
dbtx, err := db.BeginReadWriteTx() dbtx, err := db.BeginReadWriteTx()
if err != nil { if err != nil {
@ -1317,10 +1319,10 @@ func TestRemoveUnminedTx(t *testing.T) {
t.Parallel() t.Parallel()
store, db, teardown, err := testStore() store, db, teardown, err := testStore()
defer teardown()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer teardown()
dbtx, err := db.BeginReadWriteTx() dbtx, err := db.BeginReadWriteTx()
if err != nil { if err != nil {
@ -1382,6 +1384,8 @@ func TestRemoveUnminedTx(t *testing.T) {
func commitDBTx(t *testing.T, store *Store, db walletdb.DB, func commitDBTx(t *testing.T, store *Store, db walletdb.DB,
f func(walletdb.ReadWriteBucket)) { f func(walletdb.ReadWriteBucket)) {
t.Helper()
dbTx, err := db.BeginReadWriteTx() dbTx, err := db.BeginReadWriteTx()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -1401,10 +1405,10 @@ func commitDBTx(t *testing.T, store *Store, db walletdb.DB,
// removed from the wallet's store. // removed from the wallet's store.
func testInsertMempoolDoubleSpendTx(t *testing.T, first bool) { func testInsertMempoolDoubleSpendTx(t *testing.T, first bool) {
store, db, teardown, err := testStore() store, db, teardown, err := testStore()
defer teardown()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer teardown()
// In order to reproduce real-world scenarios, we'll use a new database // In order to reproduce real-world scenarios, we'll use a new database
// transaction for each interaction with the wallet. // transaction for each interaction with the wallet.
@ -1559,10 +1563,10 @@ func TestInsertConfirmedDoubleSpendTx(t *testing.T) {
t.Parallel() t.Parallel()
store, db, teardown, err := testStore() store, db, teardown, err := testStore()
defer teardown()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer teardown()
// In order to reproduce real-world scenarios, we'll use a new database // In order to reproduce real-world scenarios, we'll use a new database
// transaction for each interaction with the wallet. // transaction for each interaction with the wallet.