From 15a9f1760d7447cfe751c4742815d8b3b4ca3283 Mon Sep 17 00:00:00 2001 From: Callum Date: Wed, 29 Apr 2020 15:25:01 +0200 Subject: [PATCH] move mempool mock directory --- blockchain/v0/reactor_test.go | 2 +- blockchain/v1/reactor_test.go | 2 +- blockchain/v2/reactor_test.go | 2 +- consensus/replay.go | 2 +- consensus/replay_file.go | 2 +- consensus/replay_test.go | 2 +- consensus/wal_generator.go | 2 +- {mock => mempool/mock}/mempool.go | 0 state/execution_test.go | 2 +- state/validation_test.go | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename {mock => mempool/mock}/mempool.go (100%) diff --git a/blockchain/v0/reactor_test.go b/blockchain/v0/reactor_test.go index bddbb3f3b..6a6093a11 100644 --- a/blockchain/v0/reactor_test.go +++ b/blockchain/v0/reactor_test.go @@ -15,7 +15,7 @@ import ( cfg "github.com/tendermint/tendermint/config" evmock "github.com/tendermint/tendermint/evidence/mock" "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mock" + "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" diff --git a/blockchain/v1/reactor_test.go b/blockchain/v1/reactor_test.go index a82b2211c..344b1e608 100644 --- a/blockchain/v1/reactor_test.go +++ b/blockchain/v1/reactor_test.go @@ -18,7 +18,7 @@ import ( cfg "github.com/tendermint/tendermint/config" evmock "github.com/tendermint/tendermint/evidence/mock" "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mock" + "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" diff --git a/blockchain/v2/reactor_test.go b/blockchain/v2/reactor_test.go index aaa5c979d..80783d4c3 100644 --- a/blockchain/v2/reactor_test.go +++ b/blockchain/v2/reactor_test.go @@ -18,7 +18,7 @@ import ( evmock "github.com/tendermint/tendermint/evidence/mock" "github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/mock" + "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p/conn" "github.com/tendermint/tendermint/proxy" diff --git a/consensus/replay.go b/consensus/replay.go index 0245a5341..5d79de5e3 100644 --- a/consensus/replay.go +++ b/consensus/replay.go @@ -17,7 +17,7 @@ import ( evmock "github.com/tendermint/tendermint/evidence/mock" "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mock" + "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" diff --git a/consensus/replay_file.go b/consensus/replay_file.go index e27584ba0..48add71a7 100644 --- a/consensus/replay_file.go +++ b/consensus/replay_file.go @@ -16,7 +16,7 @@ import ( evmock "github.com/tendermint/tendermint/evidence/mock" "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/mock" + "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/store" diff --git a/consensus/replay_test.go b/consensus/replay_test.go index 7fd4f9e6d..ff3c4ca0e 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -27,7 +27,7 @@ import ( "github.com/tendermint/tendermint/libs/log" tmrand "github.com/tendermint/tendermint/libs/rand" mempl "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/mock" + "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/privval" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" diff --git a/consensus/wal_generator.go b/consensus/wal_generator.go index f14d11db3..fce9ad13d 100644 --- a/consensus/wal_generator.go +++ b/consensus/wal_generator.go @@ -18,7 +18,7 @@ import ( evmock "github.com/tendermint/tendermint/evidence/mock" "github.com/tendermint/tendermint/libs/log" tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/mock" + "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/privval" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" diff --git a/mock/mempool.go b/mempool/mock/mempool.go similarity index 100% rename from mock/mempool.go rename to mempool/mock/mempool.go diff --git a/state/execution_test.go b/state/execution_test.go index d8443100f..fa1c59407 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -14,7 +14,7 @@ import ( "github.com/tendermint/tendermint/crypto/secp256k1" evmock "github.com/tendermint/tendermint/evidence/mock" "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mock" + "github.com/tendermint/tendermint/mempool/mock" "github.com/tendermint/tendermint/proxy" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" diff --git a/state/validation_test.go b/state/validation_test.go index 8cc7f44a7..786afd071 100644 --- a/state/validation_test.go +++ b/state/validation_test.go @@ -10,7 +10,7 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" evmock "github.com/tendermint/tendermint/evidence/mock" "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mock" + "github.com/tendermint/tendermint/mempool/mock" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time"