diff --git a/benchmarks/codec_test.go b/benchmarks/codec_test.go index 0e77156c..218b3fd0 100644 --- a/benchmarks/codec_test.go +++ b/benchmarks/codec_test.go @@ -7,7 +7,7 @@ import ( "github.com/tendermint/go-p2p" "github.com/tendermint/go-wire" proto "github.com/tendermint/tendermint/benchmarks/proto" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" ) func BenchmarkEncodeStatusWire(b *testing.B) { diff --git a/benchmarks/simu/counter.go b/benchmarks/simu/counter.go index 36d1e35d..e5044766 100644 --- a/benchmarks/simu/counter.go +++ b/benchmarks/simu/counter.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/go-rpc/client" "github.com/tendermint/go-rpc/types" "github.com/tendermint/go-wire" - _ "github.com/tendermint/tendermint/rpc/core/types" // Register RPCResponse > Result types + _ "github.com/tendermint/tendermint/rpc/tendermint/core/types" // Register RPCResponse > Result types ) func main() { diff --git a/node/node.go b/node/node.go index 96440e91..84841d5d 100644 --- a/node/node.go +++ b/node/node.go @@ -20,8 +20,8 @@ import ( "github.com/tendermint/tendermint/consensus" mempl "github.com/tendermint/tendermint/mempool" "github.com/tendermint/tendermint/proxy" - rpccore "github.com/tendermint/tendermint/rpc/core" - grpccore "github.com/tendermint/tendermint/rpc/grpc" + rpccore "github.com/tendermint/tendermint/rpc/tendermint/core" + grpccore "github.com/tendermint/tendermint/rpc/tendermint/grpc" sm "github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/state/txindex" "github.com/tendermint/tendermint/state/txindex/kv" diff --git a/rpc/tendermint/client/event_test.go b/rpc/tendermint/client/event_test.go index cc421ad9..a82a284f 100644 --- a/rpc/tendermint/client/event_test.go +++ b/rpc/tendermint/client/event_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" merktest "github.com/tendermint/merkleeyes/testutil" - "github.com/tendermint/tendermint/rpc/client" + "github.com/tendermint/tendermint/rpc/tendermint/client" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/client/helpers_test.go b/rpc/tendermint/client/helpers_test.go index fe186122..1057a21b 100644 --- a/rpc/tendermint/client/helpers_test.go +++ b/rpc/tendermint/client/helpers_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/rpc/client" - "github.com/tendermint/tendermint/rpc/client/mock" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/tendermint/tendermint/rpc/tendermint/client" + "github.com/tendermint/tendermint/rpc/tendermint/client/mock" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" ) func TestWaitForHeight(t *testing.T) { diff --git a/rpc/tendermint/client/httpclient.go b/rpc/tendermint/client/httpclient.go index 88a59234..cfcd9299 100644 --- a/rpc/tendermint/client/httpclient.go +++ b/rpc/tendermint/client/httpclient.go @@ -8,7 +8,7 @@ import ( events "github.com/tendermint/go-events" "github.com/tendermint/go-rpc/client" wire "github.com/tendermint/go-wire" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/client/interface.go b/rpc/tendermint/client/interface.go index eb79db8b..8040d5d9 100644 --- a/rpc/tendermint/client/interface.go +++ b/rpc/tendermint/client/interface.go @@ -21,7 +21,7 @@ package client import ( data "github.com/tendermint/go-data" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/client/localclient.go b/rpc/tendermint/client/localclient.go index 74051d8c..34242866 100644 --- a/rpc/tendermint/client/localclient.go +++ b/rpc/tendermint/client/localclient.go @@ -3,8 +3,8 @@ package client import ( data "github.com/tendermint/go-data" nm "github.com/tendermint/tendermint/node" - "github.com/tendermint/tendermint/rpc/core" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/tendermint/tendermint/rpc/tendermint/core" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/client/main_test.go b/rpc/tendermint/client/main_test.go index 5ec911e5..494b565a 100644 --- a/rpc/tendermint/client/main_test.go +++ b/rpc/tendermint/client/main_test.go @@ -6,7 +6,7 @@ import ( meapp "github.com/tendermint/merkleeyes/app" nm "github.com/tendermint/tendermint/node" - rpctest "github.com/tendermint/tendermint/rpc/test" + rpctest "github.com/tendermint/tendermint/rpc/tendermint/test" ) var node *nm.Node diff --git a/rpc/tendermint/client/mock/abci.go b/rpc/tendermint/client/mock/abci.go index 6a9fe6bd..962744df 100644 --- a/rpc/tendermint/client/mock/abci.go +++ b/rpc/tendermint/client/mock/abci.go @@ -3,8 +3,8 @@ package mock import ( abci "github.com/tendermint/abci/types" data "github.com/tendermint/go-data" - "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/tendermint/tendermint/rpc/tendermint/client" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/client/mock/abci_test.go b/rpc/tendermint/client/mock/abci_test.go index bb3a734a..267d19df 100644 --- a/rpc/tendermint/client/mock/abci_test.go +++ b/rpc/tendermint/client/mock/abci_test.go @@ -11,10 +11,10 @@ import ( "github.com/tendermint/abci/example/dummy" abci "github.com/tendermint/abci/types" data "github.com/tendermint/go-data" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" - "github.com/tendermint/tendermint/rpc/client/mock" + "github.com/tendermint/tendermint/rpc/tendermint/client/mock" ) func TestABCIMock(t *testing.T) { diff --git a/rpc/tendermint/client/mock/client.go b/rpc/tendermint/client/mock/client.go index 47886238..f4334659 100644 --- a/rpc/tendermint/client/mock/client.go +++ b/rpc/tendermint/client/mock/client.go @@ -17,9 +17,9 @@ import ( "reflect" data "github.com/tendermint/go-data" - "github.com/tendermint/tendermint/rpc/client" - "github.com/tendermint/tendermint/rpc/core" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/tendermint/tendermint/rpc/tendermint/client" + "github.com/tendermint/tendermint/rpc/tendermint/core" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/client/mock/status.go b/rpc/tendermint/client/mock/status.go index af0f5335..82ec4098 100644 --- a/rpc/tendermint/client/mock/status.go +++ b/rpc/tendermint/client/mock/status.go @@ -1,8 +1,8 @@ package mock import ( - "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/tendermint/tendermint/rpc/tendermint/client" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" ) // StatusMock returns the result specified by the Call diff --git a/rpc/tendermint/client/mock/status_test.go b/rpc/tendermint/client/mock/status_test.go index 12edc8af..55576fb1 100644 --- a/rpc/tendermint/client/mock/status_test.go +++ b/rpc/tendermint/client/mock/status_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" data "github.com/tendermint/go-data" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" - "github.com/tendermint/tendermint/rpc/client/mock" + "github.com/tendermint/tendermint/rpc/tendermint/client/mock" ) func TestStatus(t *testing.T) { diff --git a/rpc/tendermint/client/rpc_test.go b/rpc/tendermint/client/rpc_test.go index d9f5d379..3ead008d 100644 --- a/rpc/tendermint/client/rpc_test.go +++ b/rpc/tendermint/client/rpc_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" merkle "github.com/tendermint/go-merkle" merktest "github.com/tendermint/merkleeyes/testutil" - "github.com/tendermint/tendermint/rpc/client" - rpctest "github.com/tendermint/tendermint/rpc/test" + "github.com/tendermint/tendermint/rpc/tendermint/client" + rpctest "github.com/tendermint/tendermint/rpc/tendermint/test" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/core/abci.go b/rpc/tendermint/core/abci.go index 47b599ad..519c1882 100644 --- a/rpc/tendermint/core/abci.go +++ b/rpc/tendermint/core/abci.go @@ -3,7 +3,7 @@ package core import ( abci "github.com/tendermint/abci/types" data "github.com/tendermint/go-data" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/tendermint/core/blocks.go b/rpc/tendermint/core/blocks.go index 65e47d12..39e18586 100644 --- a/rpc/tendermint/core/blocks.go +++ b/rpc/tendermint/core/blocks.go @@ -3,7 +3,7 @@ package core import ( "fmt" . "github.com/tendermint/go-common" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/core/consensus.go b/rpc/tendermint/core/consensus.go index e2ccce44..e62e61a0 100644 --- a/rpc/tendermint/core/consensus.go +++ b/rpc/tendermint/core/consensus.go @@ -3,7 +3,7 @@ package core import ( "github.com/tendermint/go-wire" cm "github.com/tendermint/tendermint/consensus" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/core/dev.go b/rpc/tendermint/core/dev.go index 43a98953..2053d736 100644 --- a/rpc/tendermint/core/dev.go +++ b/rpc/tendermint/core/dev.go @@ -6,7 +6,7 @@ import ( "runtime/pprof" "strconv" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" ) func UnsafeFlushMempool() (*ctypes.ResultUnsafeFlushMempool, error) { diff --git a/rpc/tendermint/core/events.go b/rpc/tendermint/core/events.go index 7dc3c7c3..a92eda3d 100644 --- a/rpc/tendermint/core/events.go +++ b/rpc/tendermint/core/events.go @@ -2,7 +2,7 @@ package core import ( "github.com/tendermint/go-rpc/types" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/core/mempool.go b/rpc/tendermint/core/mempool.go index 35867163..df5ea8b6 100644 --- a/rpc/tendermint/core/mempool.go +++ b/rpc/tendermint/core/mempool.go @@ -6,7 +6,7 @@ import ( abci "github.com/tendermint/abci/types" data "github.com/tendermint/go-data" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/core/net.go b/rpc/tendermint/core/net.go index 31d9c34e..49945823 100644 --- a/rpc/tendermint/core/net.go +++ b/rpc/tendermint/core/net.go @@ -3,7 +3,7 @@ package core import ( "fmt" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/tendermint/core/routes.go b/rpc/tendermint/core/routes.go index 58b46420..1b426d1d 100644 --- a/rpc/tendermint/core/routes.go +++ b/rpc/tendermint/core/routes.go @@ -4,7 +4,7 @@ import ( data "github.com/tendermint/go-data" rpc "github.com/tendermint/go-rpc/server" "github.com/tendermint/go-rpc/types" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/core/status.go b/rpc/tendermint/core/status.go index d7d50380..1a90945b 100644 --- a/rpc/tendermint/core/status.go +++ b/rpc/tendermint/core/status.go @@ -2,7 +2,7 @@ package core import ( data "github.com/tendermint/go-data" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/core/tx.go b/rpc/tendermint/core/tx.go index 7f3cdd03..7d6a2deb 100644 --- a/rpc/tendermint/core/tx.go +++ b/rpc/tendermint/core/tx.go @@ -3,7 +3,7 @@ package core import ( "fmt" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/state/txindex/null" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/grpc/api.go b/rpc/tendermint/grpc/api.go index fab811c2..f2816939 100644 --- a/rpc/tendermint/grpc/api.go +++ b/rpc/tendermint/grpc/api.go @@ -1,7 +1,7 @@ package core_grpc import ( - core "github.com/tendermint/tendermint/rpc/core" + core "github.com/tendermint/tendermint/rpc/tendermint/core" context "golang.org/x/net/context" ) diff --git a/rpc/tendermint/test/client_test.go b/rpc/tendermint/test/client_test.go index 747c5c3c..390d652e 100644 --- a/rpc/tendermint/test/client_test.go +++ b/rpc/tendermint/test/client_test.go @@ -13,8 +13,8 @@ import ( abci "github.com/tendermint/abci/types" . "github.com/tendermint/go-common" rpc "github.com/tendermint/go-rpc/client" - "github.com/tendermint/tendermint/rpc/core" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/tendermint/tendermint/rpc/tendermint/core" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" "github.com/tendermint/tendermint/state/txindex/null" "github.com/tendermint/tendermint/types" ) diff --git a/rpc/tendermint/test/grpc_test.go b/rpc/tendermint/test/grpc_test.go index 4935a09d..4fcc3e85 100644 --- a/rpc/tendermint/test/grpc_test.go +++ b/rpc/tendermint/test/grpc_test.go @@ -6,7 +6,7 @@ import ( "golang.org/x/net/context" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/rpc/grpc" + "github.com/tendermint/tendermint/rpc/tendermint/grpc" ) //------------------------------------------- diff --git a/rpc/tendermint/test/helpers.go b/rpc/tendermint/test/helpers.go index 349980e9..dbbcebbf 100644 --- a/rpc/tendermint/test/helpers.go +++ b/rpc/tendermint/test/helpers.go @@ -19,8 +19,8 @@ import ( "github.com/tendermint/tendermint/config/tendermint_test" nm "github.com/tendermint/tendermint/node" "github.com/tendermint/tendermint/proxy" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - core_grpc "github.com/tendermint/tendermint/rpc/grpc" + ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types" + core_grpc "github.com/tendermint/tendermint/rpc/tendermint/grpc" "github.com/tendermint/tendermint/types" ) diff --git a/test/app/grpc_client.go b/test/app/grpc_client.go index e43b8ae3..7d55dcd7 100644 --- a/test/app/grpc_client.go +++ b/test/app/grpc_client.go @@ -8,7 +8,7 @@ import ( "golang.org/x/net/context" "github.com/tendermint/go-wire" - "github.com/tendermint/tendermint/rpc/grpc" + "github.com/tendermint/tendermint/rpc/tendermint/grpc" ) var grpcAddr = "tcp://localhost:36656"