tendermint/rpc -> tendermint/rpc/tendermint

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) {

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() {

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"

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"
 )
 

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) {

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"
 )
 

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"
 )
 

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"
 )
 

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

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"
 )
 

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) {

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"
 )
 

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

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) {

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"
 )
 

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"
 )
 
 //-----------------------------------------------------------------------------

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"
 )
 

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"
 )
 

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) {

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"
 )
 

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"
 )
 

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"
 )
 
 //-----------------------------------------------------------------------------

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"
 )
 

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"
 )
 

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"
 )

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"
 )

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"
 )

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"
 )
 
 //-------------------------------------------

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"
 )
 

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"