From 88ddbbcddc195f0b80e2ad5232bbf8214937d4f1 Mon Sep 17 00:00:00 2001 From: Eduard S Date: Tue, 20 Oct 2020 13:08:40 +0200 Subject: [PATCH] Delete tmp folders from tests, Resolve #105 --- api/api_test.go | 5 +++++ batchbuilder/batchbuilder_test.go | 3 +++ coordinator/coordinator_test.go | 3 +++ db/statedb/statedb_test.go | 7 +++++++ db/statedb/txprocessors_test.go | 4 ++++ db/statedb/utils_test.go | 2 ++ eth/main_test.go | 5 +++++ synchronizer/synchronizer_test.go | 1 + txselector/txselector_test.go | 2 ++ 9 files changed, 32 insertions(+) diff --git a/api/api_test.go b/api/api_test.go index 220c560..006605a 100644 --- a/api/api_test.go +++ b/api/api_test.go @@ -151,6 +151,11 @@ func TestMain(m *testing.M) { if err != nil { panic(err) } + defer func() { + if err := os.RemoveAll(dir); err != nil { + panic(err) + } + }() sdb, err := statedb.NewStateDB(dir, statedb.TypeTxSelector, 0) if err != nil { panic(err) diff --git a/batchbuilder/batchbuilder_test.go b/batchbuilder/batchbuilder_test.go index 922e988..e07dd72 100644 --- a/batchbuilder/batchbuilder_test.go +++ b/batchbuilder/batchbuilder_test.go @@ -2,6 +2,7 @@ package batchbuilder import ( "io/ioutil" + "os" "testing" "github.com/hermeznetwork/hermez-node/db/statedb" @@ -12,12 +13,14 @@ import ( func TestBatchBuilder(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) synchDB, err := statedb.NewStateDB(dir, statedb.TypeBatchBuilder, 0) assert.Nil(t, err) bbDir, err := ioutil.TempDir("", "tmpBatchBuilderDB") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(bbDir)) _, err = NewBatchBuilder(bbDir, synchDB, nil, 0, 32) assert.Nil(t, err) } diff --git a/coordinator/coordinator_test.go b/coordinator/coordinator_test.go index a4fa2ff..cdd7980 100644 --- a/coordinator/coordinator_test.go +++ b/coordinator/coordinator_test.go @@ -25,6 +25,7 @@ func newTestModules(t *testing.T) (*txselector.TxSelector, *batchbuilder.BatchBu synchDBPath, err := ioutil.TempDir("", "tmpSynchDB") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(synchDBPath)) synchSdb, err := statedb.NewStateDB(synchDBPath, statedb.TypeSynchronizer, nLevels) assert.Nil(t, err) @@ -44,11 +45,13 @@ func newTestModules(t *testing.T) (*txselector.TxSelector, *batchbuilder.BatchBu txselDir, err := ioutil.TempDir("", "tmpTxSelDB") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(txselDir)) txsel, err := txselector.NewTxSelector(txselDir, synchSdb, l2DB, 10, 10, 10) assert.Nil(t, err) bbDir, err := ioutil.TempDir("", "tmpBatchBuilderDB") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(bbDir)) bb, err := batchbuilder.NewBatchBuilder(bbDir, synchSdb, nil, 0, uint64(nLevels)) assert.Nil(t, err) diff --git a/db/statedb/statedb_test.go b/db/statedb/statedb_test.go index 48a100d..1da0678 100644 --- a/db/statedb/statedb_test.go +++ b/db/statedb/statedb_test.go @@ -5,6 +5,7 @@ import ( "fmt" "io/ioutil" "math/big" + "os" "testing" ethCrypto "github.com/ethereum/go-ethereum/crypto" @@ -37,6 +38,7 @@ func newAccount(t *testing.T, i int) *common.Account { func TestNewStateDBIntermediateState(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) sdb, err := NewStateDB(dir, TypeTxSelector, 0) assert.Nil(t, err) @@ -118,6 +120,7 @@ func TestNewStateDBIntermediateState(t *testing.T) { func TestStateDBWithoutMT(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) sdb, err := NewStateDB(dir, TypeTxSelector, 0) assert.Nil(t, err) @@ -171,6 +174,7 @@ func TestStateDBWithoutMT(t *testing.T) { func TestStateDBWithMT(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) sdb, err := NewStateDB(dir, TypeSynchronizer, 32) assert.Nil(t, err) @@ -222,6 +226,7 @@ func TestStateDBWithMT(t *testing.T) { func TestCheckpoints(t *testing.T) { dir, err := ioutil.TempDir("", "sdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) sdb, err := NewStateDB(dir, TypeSynchronizer, 32) assert.Nil(t, err) @@ -289,6 +294,7 @@ func TestCheckpoints(t *testing.T) { // Create a LocalStateDB from the initial StateDB dirLocal, err := ioutil.TempDir("", "ldb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dirLocal)) ldb, err := NewLocalStateDB(dirLocal, sdb, TypeBatchBuilder, 32) assert.Nil(t, err) @@ -309,6 +315,7 @@ func TestCheckpoints(t *testing.T) { // Create a 2nd LocalStateDB from the initial StateDB dirLocal2, err := ioutil.TempDir("", "ldb2") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dirLocal2)) ldb2, err := NewLocalStateDB(dirLocal2, sdb, TypeBatchBuilder, 32) assert.Nil(t, err) diff --git a/db/statedb/txprocessors_test.go b/db/statedb/txprocessors_test.go index 13c2d1f..09cbdb3 100644 --- a/db/statedb/txprocessors_test.go +++ b/db/statedb/txprocessors_test.go @@ -2,6 +2,7 @@ package statedb import ( "io/ioutil" + "os" "testing" "github.com/hermeznetwork/hermez-node/common" @@ -16,6 +17,7 @@ func TestProcessTxsSynchronizer(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) sdb, err := NewStateDB(dir, TypeSynchronizer, 32) assert.Nil(t, err) @@ -72,6 +74,7 @@ WIP func TestProcessTxsBatchBuilder(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) sdb, err := NewStateDB(dir, TypeBatchBuilder, 32) assert.Nil(t, err) @@ -121,6 +124,7 @@ func TestProcessTxsBatchBuilder(t *testing.T) { func TestZKInputsGeneration(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) sdb, err := NewStateDB(dir, TypeBatchBuilder, 32) assert.Nil(t, err) diff --git a/db/statedb/utils_test.go b/db/statedb/utils_test.go index 821cea3..b608acf 100644 --- a/db/statedb/utils_test.go +++ b/db/statedb/utils_test.go @@ -3,6 +3,7 @@ package statedb import ( "io/ioutil" "math/big" + "os" "testing" ethCommon "github.com/ethereum/go-ethereum/common" @@ -15,6 +16,7 @@ import ( func TestGetIdx(t *testing.T) { dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) sdb, err := NewStateDB(dir, TypeTxSelector, 0) assert.Nil(t, err) diff --git a/eth/main_test.go b/eth/main_test.go index 041045d..ffab343 100644 --- a/eth/main_test.go +++ b/eth/main_test.go @@ -115,6 +115,11 @@ func TestMain(m *testing.M) { if err != nil { panic(err) } + defer func() { + if err := os.RemoveAll(dir); err != nil { + panic(err) + } + }() ks = keystore.NewKeyStore(dir, keystore.LightScryptN, keystore.LightScryptP) // Load ethereum accounts from private keys diff --git a/synchronizer/synchronizer_test.go b/synchronizer/synchronizer_test.go index ecc1950..630783b 100644 --- a/synchronizer/synchronizer_test.go +++ b/synchronizer/synchronizer_test.go @@ -29,6 +29,7 @@ func TestSync(t *testing.T) { // Int State DB dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) stateDB, err := statedb.NewStateDB(dir, statedb.TypeSynchronizer, 32) assert.Nil(t, err) diff --git a/txselector/txselector_test.go b/txselector/txselector_test.go index ce781a9..e32eac9 100644 --- a/txselector/txselector_test.go +++ b/txselector/txselector_test.go @@ -10,11 +10,13 @@ func initTest(t *testing.T, testSet string, maxL1UserTxs, maxL1OperatorTxs, maxT dir, err := ioutil.TempDir("", "tmpdb") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) sdb, err := statedb.NewStateDB(dir, statedb.TypeTxSelector, 0) require.Nil(t, err) txselDir, err := ioutil.TempDir("", "tmpTxSelDB") require.Nil(t, err) + defer assert.Nil(t, os.RemoveAll(dir)) txsel, err := NewTxSelector(txselDir, sdb, l2DB, maxL1UserTxs, maxL1OperatorTxs, maxTxs) require.Nil(t, err)