From a605b66c5a381e3c44f2e0fdfc1e8f3b2851a89d Mon Sep 17 00:00:00 2001 From: Alexander Simmerl Date: Fri, 22 Jun 2018 06:59:02 +0200 Subject: [PATCH] Move abci imports --- Gopkg.toml | 4 ---- abci/client/client.go | 2 +- abci/client/grpc_client.go | 2 +- abci/client/local_client.go | 2 +- abci/client/socket_client.go | 2 +- abci/client/socket_client_test.go | 2 +- abci/cmd/abci-cli/abci-cli.go | 16 ++++++++-------- abci/example/counter/counter.go | 4 ++-- abci/example/example_test.go | 10 +++++----- abci/example/kvstore/helpers.go | 2 +- abci/example/kvstore/kvstore.go | 4 ++-- abci/example/kvstore/kvstore_test.go | 8 ++++---- abci/example/kvstore/persistent_kvstore.go | 4 ++-- abci/server/grpc_server.go | 2 +- abci/server/server.go | 2 +- abci/server/socket_server.go | 2 +- abci/tests/benchmarks/parallel/parallel.go | 2 +- abci/tests/benchmarks/simple/simple.go | 2 +- abci/tests/client_server_test.go | 6 +++--- abci/tests/server/client.go | 4 ++-- abci/tests/test_app/app.go | 4 ++-- abci/tests/test_app/main.go | 4 ++-- consensus/common_test.go | 8 ++++---- consensus/mempool_test.go | 4 ++-- consensus/reactor_test.go | 2 +- consensus/replay.go | 2 +- consensus/replay_test.go | 4 ++-- consensus/wal_generator.go | 2 +- lite/client/main_test.go | 2 +- lite/proxy/query_test.go | 2 +- mempool/mempool.go | 2 +- mempool/mempool_test.go | 6 +++--- mempool/reactor.go | 2 +- mempool/reactor_test.go | 2 +- node/node.go | 2 +- proxy/app_conn.go | 4 ++-- proxy/app_conn_test.go | 8 ++++---- proxy/client.go | 6 +++--- rpc/client/event_test.go | 2 +- rpc/client/main_test.go | 2 +- rpc/client/mock/abci.go | 2 +- rpc/client/mock/abci_test.go | 4 ++-- rpc/client/rpc_test.go | 2 +- rpc/core/abci.go | 2 +- rpc/core/mempool.go | 2 +- rpc/core/types/responses.go | 2 +- rpc/grpc/api.go | 2 +- rpc/grpc/grpc_test.go | 2 +- rpc/grpc/types.pb.go | 2 +- rpc/grpc/types.proto | 2 +- rpc/test/helpers.go | 2 +- state/execution.go | 2 +- state/execution_test.go | 4 ++-- state/services.go | 2 +- state/state_test.go | 2 +- state/store.go | 2 +- state/txindex/kv/kv_test.go | 2 +- types/event_bus_test.go | 2 +- types/params.go | 2 +- types/protobuf.go | 2 +- types/protobuf_test.go | 2 +- types/results.go | 2 +- types/tx.go | 2 +- 63 files changed, 99 insertions(+), 103 deletions(-) diff --git a/Gopkg.toml b/Gopkg.toml index d9b381337..bf143341c 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -69,10 +69,6 @@ name = "github.com/stretchr/testify" version = "~1.2.1" -[[constraint]] - name = "github.com/tendermint/abci" - version = "~0.12.0" - [[constraint]] name = "github.com/tendermint/go-amino" version = "~0.10.1" diff --git a/abci/client/client.go b/abci/client/client.go index ad0e5a7ab..cdf2c60e7 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index 0f405a9c4..e64fcb4d6 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -9,7 +9,7 @@ import ( context "golang.org/x/net/context" grpc "google.golang.org/grpc" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/client/local_client.go b/abci/client/local_client.go index 64bf5fe08..225273a96 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -3,7 +3,7 @@ package abcicli import ( "sync" - types "github.com/tendermint/abci/types" + types "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 5c0101685..77c3d966a 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/client/socket_client_test.go b/abci/client/socket_client_test.go index 814d5a68c..5a9187fb4 100644 --- a/abci/client/socket_client_test.go +++ b/abci/client/socket_client_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/client" ) func TestSocketClientStopForErrorDeadlock(t *testing.T) { diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go index b773c990b..0e7b908e7 100644 --- a/abci/cmd/abci-cli/abci-cli.go +++ b/abci/cmd/abci-cli/abci-cli.go @@ -14,14 +14,14 @@ import ( cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/log" - abcicli "github.com/tendermint/abci/client" - "github.com/tendermint/abci/example/code" - "github.com/tendermint/abci/example/counter" - "github.com/tendermint/abci/example/kvstore" - "github.com/tendermint/abci/server" - servertest "github.com/tendermint/abci/tests/server" - "github.com/tendermint/abci/types" - "github.com/tendermint/abci/version" + abcicli "github.com/tendermint/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/example/code" + "github.com/tendermint/tendermint/abci/example/counter" + "github.com/tendermint/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/server" + servertest "github.com/tendermint/tendermint/abci/tests/server" + "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/version" ) // client is a global variable so it can be reused by the console diff --git a/abci/example/counter/counter.go b/abci/example/counter/counter.go index a6d5df6ab..87fc7b188 100644 --- a/abci/example/counter/counter.go +++ b/abci/example/counter/counter.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "fmt" - "github.com/tendermint/abci/example/code" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/example/code" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/example/example_test.go b/abci/example/example_test.go index 3fc38f492..a3d161a2f 100644 --- a/abci/example/example_test.go +++ b/abci/example/example_test.go @@ -14,11 +14,11 @@ import ( cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/log" - abcicli "github.com/tendermint/abci/client" - "github.com/tendermint/abci/example/code" - "github.com/tendermint/abci/example/kvstore" - abciserver "github.com/tendermint/abci/server" - "github.com/tendermint/abci/types" + abcicli "github.com/tendermint/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/example/code" + "github.com/tendermint/tendermint/abci/example/kvstore" + abciserver "github.com/tendermint/tendermint/abci/server" + "github.com/tendermint/tendermint/abci/types" ) func TestKVStore(t *testing.T) { diff --git a/abci/example/kvstore/helpers.go b/abci/example/kvstore/helpers.go index 63bc31a63..7ddacb5bf 100644 --- a/abci/example/kvstore/helpers.go +++ b/abci/example/kvstore/helpers.go @@ -1,7 +1,7 @@ package kvstore import ( - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index 4ccbc56b0..e078d87d1 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -6,8 +6,8 @@ import ( "encoding/json" "fmt" - "github.com/tendermint/abci/example/code" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/example/code" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" ) diff --git a/abci/example/kvstore/kvstore_test.go b/abci/example/kvstore/kvstore_test.go index ff3e49208..46c28c99e 100644 --- a/abci/example/kvstore/kvstore_test.go +++ b/abci/example/kvstore/kvstore_test.go @@ -11,10 +11,10 @@ import ( cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/log" - abcicli "github.com/tendermint/abci/client" - "github.com/tendermint/abci/example/code" - abciserver "github.com/tendermint/abci/server" - "github.com/tendermint/abci/types" + abcicli "github.com/tendermint/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/example/code" + abciserver "github.com/tendermint/tendermint/abci/server" + "github.com/tendermint/tendermint/abci/types" ) func testKVStore(t *testing.T, app types.Application, tx []byte, key, value string) { diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 02f7ce74a..a9067ac14 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/tendermint/abci/example/code" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/example/code" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" "github.com/tendermint/tmlibs/log" diff --git a/abci/server/grpc_server.go b/abci/server/grpc_server.go index e7dad15cf..3f8b599e9 100644 --- a/abci/server/grpc_server.go +++ b/abci/server/grpc_server.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/server/server.go b/abci/server/server.go index 0bbd65e37..49dde4280 100644 --- a/abci/server/server.go +++ b/abci/server/server.go @@ -12,7 +12,7 @@ package server import ( "fmt" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index eb26dc353..e7293ffd7 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -7,7 +7,7 @@ import ( "net" "sync" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/tests/benchmarks/parallel/parallel.go b/abci/tests/benchmarks/parallel/parallel.go index cc68ceadc..0b4634492 100644 --- a/abci/tests/benchmarks/parallel/parallel.go +++ b/abci/tests/benchmarks/parallel/parallel.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/tests/benchmarks/simple/simple.go b/abci/tests/benchmarks/simple/simple.go index ef5bab86b..77b98d57d 100644 --- a/abci/tests/benchmarks/simple/simple.go +++ b/abci/tests/benchmarks/simple/simple.go @@ -7,7 +7,7 @@ import ( "net" "reflect" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/tests/client_server_test.go b/abci/tests/client_server_test.go index 1f05c9a71..f76c9baf1 100644 --- a/abci/tests/client_server_test.go +++ b/abci/tests/client_server_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/assert" - abciclient "github.com/tendermint/abci/client" - "github.com/tendermint/abci/example/kvstore" - abciserver "github.com/tendermint/abci/server" + abciclient "github.com/tendermint/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/example/kvstore" + abciserver "github.com/tendermint/tendermint/abci/server" ) func TestClientServerNoAddrPrefix(t *testing.T) { diff --git a/abci/tests/server/client.go b/abci/tests/server/client.go index 5ef978c73..06db13d9a 100644 --- a/abci/tests/server/client.go +++ b/abci/tests/server/client.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - abcicli "github.com/tendermint/abci/client" - "github.com/tendermint/abci/types" + abcicli "github.com/tendermint/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" ) diff --git a/abci/tests/test_app/app.go b/abci/tests/test_app/app.go index 1c308ec0d..42092345a 100644 --- a/abci/tests/test_app/app.go +++ b/abci/tests/test_app/app.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - abcicli "github.com/tendermint/abci/client" - "github.com/tendermint/abci/types" + abcicli "github.com/tendermint/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tmlibs/log" ) diff --git a/abci/tests/test_app/main.go b/abci/tests/test_app/main.go index 95a7515d4..8f45cec3c 100644 --- a/abci/tests/test_app/main.go +++ b/abci/tests/test_app/main.go @@ -7,8 +7,8 @@ import ( "os/exec" "time" - "github.com/tendermint/abci/example/code" - "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/example/code" + "github.com/tendermint/tendermint/abci/types" ) var abciType string diff --git a/consensus/common_test.go b/consensus/common_test.go index f50e57699..b990f525c 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - abcicli "github.com/tendermint/abci/client" - abci "github.com/tendermint/abci/types" + abcicli "github.com/tendermint/tendermint/abci/client" + abci "github.com/tendermint/tendermint/abci/types" bc "github.com/tendermint/tendermint/blockchain" cfg "github.com/tendermint/tendermint/config" cstypes "github.com/tendermint/tendermint/consensus/types" @@ -26,8 +26,8 @@ import ( dbm "github.com/tendermint/tmlibs/db" "github.com/tendermint/tmlibs/log" - "github.com/tendermint/abci/example/counter" - "github.com/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/example/counter" + "github.com/tendermint/tendermint/abci/example/kvstore" "github.com/go-kit/kit/log/term" ) diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go index 3c8180060..032cf2f32 100644 --- a/consensus/mempool_test.go +++ b/consensus/mempool_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/tendermint/abci/example/code" - abci "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/example/code" + abci "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tendermint/types" diff --git a/consensus/reactor_test.go b/consensus/reactor_test.go index 0d9971192..498a857b9 100644 --- a/consensus/reactor_test.go +++ b/consensus/reactor_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/example/kvstore" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/log" diff --git a/consensus/replay.go b/consensus/replay.go index 13ec9e403..f681828cf 100644 --- a/consensus/replay.go +++ b/consensus/replay.go @@ -10,7 +10,7 @@ import ( //"strings" "time" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" //auto "github.com/tendermint/tmlibs/autofile" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" diff --git a/consensus/replay_test.go b/consensus/replay_test.go index 927dfadca..f76651d72 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/abci/example/kvstore" - abci "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/example/kvstore" + abci "github.com/tendermint/tendermint/abci/types" crypto "github.com/tendermint/tendermint/crypto" auto "github.com/tendermint/tmlibs/autofile" cmn "github.com/tendermint/tmlibs/common" diff --git a/consensus/wal_generator.go b/consensus/wal_generator.go index 9a4b70595..1a61c3405 100644 --- a/consensus/wal_generator.go +++ b/consensus/wal_generator.go @@ -10,7 +10,7 @@ import ( "time" "github.com/pkg/errors" - "github.com/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/example/kvstore" bc "github.com/tendermint/tendermint/blockchain" cfg "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/privval" diff --git a/lite/client/main_test.go b/lite/client/main_test.go index 972d37310..49b194366 100644 --- a/lite/client/main_test.go +++ b/lite/client/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/example/kvstore" nm "github.com/tendermint/tendermint/node" rpctest "github.com/tendermint/tendermint/rpc/test" diff --git a/lite/proxy/query_test.go b/lite/proxy/query_test.go index d6dcccc96..38a43af2b 100644 --- a/lite/proxy/query_test.go +++ b/lite/proxy/query_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/example/kvstore" "github.com/tendermint/tendermint/lite" certclient "github.com/tendermint/tendermint/lite/client" diff --git a/mempool/mempool.go b/mempool/mempool.go index 2921b518b..8c9e41d59 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" auto "github.com/tendermint/tmlibs/autofile" "github.com/tendermint/tmlibs/clist" cmn "github.com/tendermint/tmlibs/common" diff --git a/mempool/mempool_test.go b/mempool/mempool_test.go index a67adf6d3..fb664ddec 100644 --- a/mempool/mempool_test.go +++ b/mempool/mempool_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/tendermint/abci/example/counter" - "github.com/tendermint/abci/example/kvstore" - abci "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/example/counter" + "github.com/tendermint/tendermint/abci/example/kvstore" + abci "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/log" diff --git a/mempool/reactor.go b/mempool/reactor.go index 5d1f4e793..d6cebfbf3 100644 --- a/mempool/reactor.go +++ b/mempool/reactor.go @@ -5,7 +5,7 @@ import ( "reflect" "time" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" amino "github.com/tendermint/go-amino" "github.com/tendermint/tmlibs/clist" "github.com/tendermint/tmlibs/log" diff --git a/mempool/reactor_test.go b/mempool/reactor_test.go index 0a6d09153..c6844dbb0 100644 --- a/mempool/reactor_test.go +++ b/mempool/reactor_test.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/kit/log/term" - "github.com/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/example/kvstore" "github.com/tendermint/tmlibs/log" cfg "github.com/tendermint/tendermint/config" diff --git a/node/node.go b/node/node.go index 896840488..3e1ca0237 100644 --- a/node/node.go +++ b/node/node.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" amino "github.com/tendermint/go-amino" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 2319fed82..2f792671e 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -1,8 +1,8 @@ package proxy import ( - abcicli "github.com/tendermint/abci/client" - "github.com/tendermint/abci/types" + abcicli "github.com/tendermint/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/types" ) //---------------------------------------------------------------------------------------- diff --git a/proxy/app_conn_test.go b/proxy/app_conn_test.go index 7eb3831cd..a50071fea 100644 --- a/proxy/app_conn_test.go +++ b/proxy/app_conn_test.go @@ -4,10 +4,10 @@ import ( "strings" "testing" - abcicli "github.com/tendermint/abci/client" - "github.com/tendermint/abci/example/kvstore" - "github.com/tendermint/abci/server" - "github.com/tendermint/abci/types" + abcicli "github.com/tendermint/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/server" + "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/log" ) diff --git a/proxy/client.go b/proxy/client.go index 6c987368a..87f4e716d 100644 --- a/proxy/client.go +++ b/proxy/client.go @@ -5,9 +5,9 @@ import ( "github.com/pkg/errors" - abcicli "github.com/tendermint/abci/client" - "github.com/tendermint/abci/example/kvstore" - "github.com/tendermint/abci/types" + abcicli "github.com/tendermint/tendermint/abci/client" + "github.com/tendermint/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/types" ) // NewABCIClient returns newly connected client diff --git a/rpc/client/event_test.go b/rpc/client/event_test.go index 2254c1d1e..844d2b88a 100644 --- a/rpc/client/event_test.go +++ b/rpc/client/event_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/rpc/client" "github.com/tendermint/tendermint/types" cmn "github.com/tendermint/tmlibs/common" diff --git a/rpc/client/main_test.go b/rpc/client/main_test.go index 82b5a0195..1e911bbe6 100644 --- a/rpc/client/main_test.go +++ b/rpc/client/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/example/kvstore" nm "github.com/tendermint/tendermint/node" rpctest "github.com/tendermint/tendermint/rpc/test" ) diff --git a/rpc/client/mock/abci.go b/rpc/client/mock/abci.go index 7f4c45df3..244855c6b 100644 --- a/rpc/client/mock/abci.go +++ b/rpc/client/mock/abci.go @@ -1,7 +1,7 @@ package mock import ( - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/rpc/client" ctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/tendermint/tendermint/types" diff --git a/rpc/client/mock/abci_test.go b/rpc/client/mock/abci_test.go index 564f0129a..323a42a47 100644 --- a/rpc/client/mock/abci_test.go +++ b/rpc/client/mock/abci_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/abci/example/kvstore" - abci "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/example/kvstore" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/rpc/client" "github.com/tendermint/tendermint/rpc/client/mock" ctypes "github.com/tendermint/tendermint/rpc/core/types" diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go index 13109f786..e7e9042a7 100644 --- a/rpc/client/rpc_test.go +++ b/rpc/client/rpc_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/rpc/client" rpctest "github.com/tendermint/tendermint/rpc/test" diff --git a/rpc/core/abci.go b/rpc/core/abci.go index 067108c44..c07724d58 100644 --- a/rpc/core/abci.go +++ b/rpc/core/abci.go @@ -1,7 +1,7 @@ package core import ( - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" ctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/tendermint/tendermint/version" cmn "github.com/tendermint/tmlibs/common" diff --git a/rpc/core/mempool.go b/rpc/core/mempool.go index 515ada87c..437f5965a 100644 --- a/rpc/core/mempool.go +++ b/rpc/core/mempool.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" ctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/tendermint/tendermint/types" cmn "github.com/tendermint/tmlibs/common" diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go index 8c0053b7d..a6fedd28a 100644 --- a/rpc/core/types/responses.go +++ b/rpc/core/types/responses.go @@ -5,7 +5,7 @@ import ( "strings" "time" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" crypto "github.com/tendermint/tendermint/crypto" cmn "github.com/tendermint/tmlibs/common" diff --git a/rpc/grpc/api.go b/rpc/grpc/api.go index c0a920046..0b840e3e9 100644 --- a/rpc/grpc/api.go +++ b/rpc/grpc/api.go @@ -3,7 +3,7 @@ package core_grpc import ( "context" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" core "github.com/tendermint/tendermint/rpc/core" ) diff --git a/rpc/grpc/grpc_test.go b/rpc/grpc/grpc_test.go index 20b3ab7b7..fe979c549 100644 --- a/rpc/grpc/grpc_test.go +++ b/rpc/grpc/grpc_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/abci/example/kvstore" + "github.com/tendermint/tendermint/abci/example/kvstore" "github.com/tendermint/tendermint/rpc/grpc" "github.com/tendermint/tendermint/rpc/test" ) diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go index cf7a5ec71..be16b711a 100644 --- a/rpc/grpc/types.pb.go +++ b/rpc/grpc/types.pb.go @@ -19,7 +19,7 @@ package core_grpc import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import types "github.com/tendermint/abci/types" +import types "github.com/tendermint/tendermint/abci/types" import ( "context" diff --git a/rpc/grpc/types.proto b/rpc/grpc/types.proto index 354625948..d7980d5e0 100644 --- a/rpc/grpc/types.proto +++ b/rpc/grpc/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package core_grpc; -import "github.com/tendermint/abci/types/types.proto"; +import "github.com/tendermint/tendermint/abci/types/types.proto"; //---------------------------------------- // Message types diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go index b434c7d92..1d6f865c2 100644 --- a/rpc/test/helpers.go +++ b/rpc/test/helpers.go @@ -10,7 +10,7 @@ import ( "github.com/tendermint/tmlibs/log" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" cfg "github.com/tendermint/tendermint/config" diff --git a/state/execution.go b/state/execution.go index e6b94429e..0d6ee81bf 100644 --- a/state/execution.go +++ b/state/execution.go @@ -4,7 +4,7 @@ import ( "fmt" fail "github.com/ebuchman/fail-test" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/proxy" "github.com/tendermint/tendermint/types" dbm "github.com/tendermint/tmlibs/db" diff --git a/state/execution_test.go b/state/execution_test.go index 921bda59b..71fbe3a4d 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/abci/example/kvstore" - abci "github.com/tendermint/abci/types" + "github.com/tendermint/tendermint/abci/example/kvstore" + abci "github.com/tendermint/tendermint/abci/types" crypto "github.com/tendermint/tendermint/crypto" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" diff --git a/state/services.go b/state/services.go index bef286b20..bf0b1a6f4 100644 --- a/state/services.go +++ b/state/services.go @@ -1,7 +1,7 @@ package state import ( - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/types" ) diff --git a/state/state_test.go b/state/state_test.go index 67de68487..30a87fb05 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" crypto "github.com/tendermint/tendermint/crypto" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" diff --git a/state/store.go b/state/store.go index 2164d699d..798932541 100644 --- a/state/store.go +++ b/state/store.go @@ -3,7 +3,7 @@ package state import ( "fmt" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/types" cmn "github.com/tendermint/tmlibs/common" dbm "github.com/tendermint/tmlibs/db" diff --git a/state/txindex/kv/kv_test.go b/state/txindex/kv/kv_test.go index af35ec411..cb718a5fa 100644 --- a/state/txindex/kv/kv_test.go +++ b/state/txindex/kv/kv_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" db "github.com/tendermint/tmlibs/db" diff --git a/types/event_bus_test.go b/types/event_bus_test.go index d9b0995b9..a5de2e84d 100644 --- a/types/event_bus_test.go +++ b/types/event_bus_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" tmpubsub "github.com/tendermint/tendermint/libs/pubsub" tmquery "github.com/tendermint/tendermint/libs/pubsub/query" cmn "github.com/tendermint/tmlibs/common" diff --git a/types/params.go b/types/params.go index 2df092d62..d068342c6 100644 --- a/types/params.go +++ b/types/params.go @@ -1,7 +1,7 @@ package types import ( - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/merkle" ) diff --git a/types/protobuf.go b/types/protobuf.go index 5155b4b81..6a6077796 100644 --- a/types/protobuf.go +++ b/types/protobuf.go @@ -6,7 +6,7 @@ import ( "reflect" "time" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" crypto "github.com/tendermint/tendermint/crypto" ) diff --git a/types/protobuf_test.go b/types/protobuf_test.go index da67e1c30..cd986fd81 100644 --- a/types/protobuf_test.go +++ b/types/protobuf_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" crypto "github.com/tendermint/tendermint/crypto" ) diff --git a/types/results.go b/types/results.go index 326cee48d..9f4f33c36 100644 --- a/types/results.go +++ b/types/results.go @@ -1,7 +1,7 @@ package types import ( - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/merkle" ) diff --git a/types/tx.go b/types/tx.go index e7247693a..cad7dda3a 100644 --- a/types/tx.go +++ b/types/tx.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - abci "github.com/tendermint/abci/types" + abci "github.com/tendermint/tendermint/abci/types" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/merkle" )