diff options
| author | Janoš Guljaš <janos@users.noreply.github.com> | 2018-11-22 03:49:13 +0800 |
|---|---|---|
| committer | Anton Evangelatov <anton.evangelatov@gmail.com> | 2018-11-22 03:49:13 +0800 |
| commit | 070caec4bd72b1a958ece5f2b8fcc2bb92d44796 (patch) | |
| tree | 2b3f9369daaea984c15ee53f31af12cc02989db4 /swarm/network/stream/snapshot_sync_test.go | |
| parent | 4c181e4fb98bb88503cccd6147026b6c2b7b56f6 (diff) | |
| download | go-tangerine-070caec4bd72b1a958ece5f2b8fcc2bb92d44796.tar go-tangerine-070caec4bd72b1a958ece5f2b8fcc2bb92d44796.tar.gz go-tangerine-070caec4bd72b1a958ece5f2b8fcc2bb92d44796.tar.bz2 go-tangerine-070caec4bd72b1a958ece5f2b8fcc2bb92d44796.tar.lz go-tangerine-070caec4bd72b1a958ece5f2b8fcc2bb92d44796.tar.xz go-tangerine-070caec4bd72b1a958ece5f2b8fcc2bb92d44796.tar.zst go-tangerine-070caec4bd72b1a958ece5f2b8fcc2bb92d44796.zip | |
swarm/network/stream: use swarm/mock/mem as mock global store (#18157)
Diffstat (limited to 'swarm/network/stream/snapshot_sync_test.go')
| -rw-r--r-- | swarm/network/stream/snapshot_sync_test.go | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/swarm/network/stream/snapshot_sync_test.go b/swarm/network/stream/snapshot_sync_test.go index 6b92c32ae..4e56f71b5 100644 --- a/swarm/network/stream/snapshot_sync_test.go +++ b/swarm/network/stream/snapshot_sync_test.go @@ -35,7 +35,8 @@ import ( "github.com/ethereum/go-ethereum/swarm/pot" "github.com/ethereum/go-ethereum/swarm/state" "github.com/ethereum/go-ethereum/swarm/storage" - mockdb "github.com/ethereum/go-ethereum/swarm/storage/mock/db" + "github.com/ethereum/go-ethereum/swarm/storage/mock" + mockmem "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" "github.com/ethereum/go-ethereum/swarm/testutil" ) @@ -268,20 +269,9 @@ func runSim(conf *synctestConfig, ctx context.Context, sim *simulation.Simulatio // File retrieval check is repeated until all uploaded files are retrieved from all nodes // or until the timeout is reached. - var gDir string - var globalStore *mockdb.GlobalStore + var globalStore mock.GlobalStorer if *useMockStore { - gDir, globalStore, err = createGlobalStore() - if err != nil { - return fmt.Errorf("Something went wrong; using mockStore enabled but globalStore is nil") - } - defer func() { - os.RemoveAll(gDir) - err := globalStore.Close() - if err != nil { - log.Error("Error closing global store! %v", "err", err) - } - }() + globalStore = mockmem.NewGlobalStore() } REPEAT: for { @@ -476,14 +466,9 @@ func testSyncingViaDirectSubscribe(t *testing.T, chunkCount int, nodeCount int) return err } - var gDir string - var globalStore *mockdb.GlobalStore + var globalStore mock.GlobalStorer if *useMockStore { - gDir, globalStore, err = createGlobalStore() - if err != nil { - return fmt.Errorf("Something went wrong; using mockStore enabled but globalStore is nil") - } - defer os.RemoveAll(gDir) + globalStore = mockmem.NewGlobalStore() } // File retrieval check is repeated until all uploaded files are retrieved from all nodes // or until the timeout is reached. |