rpc -> rpc/lib and rpc/tendermint -> rpc

benchmarks/codec_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/go-wire"
 	proto "github.com/tendermint/tendermint/benchmarks/proto"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 func BenchmarkEncodeStatusWire(b *testing.B) {

benchmarks/simu/counter.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/gorilla/websocket"
 	. "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/types"
+	"github.com/tendermint/tendermint/rpc/lib/client"
+	"github.com/tendermint/tendermint/rpc/lib/types"
 	"github.com/tendermint/go-wire"
-	_ "github.com/tendermint/tendermint/rpc/tendermint/core/types" // Register RPCResponse > Result types
+	_ "github.com/tendermint/tendermint/rpc/core/types" // Register RPCResponse > Result types
 )
 
 func main() {

node/node.go

@@ -17,10 +17,10 @@ import (
 	mempl "github.com/tendermint/tendermint/mempool"
 	p2p "github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/tendermint/proxy"
-	rpc "github.com/tendermint/tendermint/rpc"
-	rpcserver "github.com/tendermint/tendermint/rpc/server"
-	rpccore "github.com/tendermint/tendermint/rpc/tendermint/core"
-	grpccore "github.com/tendermint/tendermint/rpc/tendermint/grpc"
+	rpccore "github.com/tendermint/tendermint/rpc/core"
+	grpccore "github.com/tendermint/tendermint/rpc/grpc"
+	rpc "github.com/tendermint/tendermint/rpc/lib"
+	rpcserver "github.com/tendermint/tendermint/rpc/lib/server"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/state/txindex"
 	"github.com/tendermint/tendermint/state/txindex/kv"

rpc/Dockerfile

@@ -1,12 +0,0 @@
-FROM golang:latest
-
-RUN mkdir -p /go/src/github.com/tendermint/tendermint/rpc
-WORKDIR /go/src/github.com/tendermint/tendermint/rpc
-
-COPY Makefile /go/src/github.com/tendermint/tendermint/rpc/
-# COPY glide.yaml /go/src/github.com/tendermint/tendermint/rpc/
-# COPY glide.lock /go/src/github.com/tendermint/tendermint/rpc/
-
-COPY . /go/src/github.com/tendermint/tendermint/rpc
-
-RUN make get_deps

rpc/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/tendermint/client"
+	"github.com/tendermint/tendermint/rpc/client"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/client/helpers_test.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/rpc/tendermint/client"
-	"github.com/tendermint/tendermint/rpc/tendermint/client/mock"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	"github.com/tendermint/tendermint/rpc/client"
+	"github.com/tendermint/tendermint/rpc/client/mock"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 func TestWaitForHeight(t *testing.T) {

rpc/client/httpclient.go

@@ -6,9 +6,9 @@ import (
 	"github.com/pkg/errors"
 	data "github.com/tendermint/go-wire/data"
 	events "github.com/tendermint/tmlibs/events"
-	"github.com/tendermint/tendermint/rpc/client"
+	"github.com/tendermint/tendermint/rpc/lib/client"
 	wire "github.com/tendermint/go-wire"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/client/interface.go

@@ -21,7 +21,7 @@ package client
 
 import (
 	data "github.com/tendermint/go-wire/data"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/client/localclient.go

@@ -3,8 +3,8 @@ package client
 import (
 	data "github.com/tendermint/go-wire/data"
 	nm "github.com/tendermint/tendermint/node"
-	"github.com/tendermint/tendermint/rpc/tendermint/core"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	"github.com/tendermint/tendermint/rpc/core"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/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/tendermint/test"
+	rpctest "github.com/tendermint/tendermint/rpc/test"
 )
 
 var node *nm.Node

rpc/client/mock/abci.go

@@ -3,8 +3,8 @@ package mock
 import (
 	abci "github.com/tendermint/abci/types"
 	data "github.com/tendermint/go-wire/data"
-	"github.com/tendermint/tendermint/rpc/tendermint/client"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	"github.com/tendermint/tendermint/rpc/client"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/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-wire/data"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 
-	"github.com/tendermint/tendermint/rpc/tendermint/client/mock"
+	"github.com/tendermint/tendermint/rpc/client/mock"
 )
 
 func TestABCIMock(t *testing.T) {

rpc/client/mock/client.go

@@ -17,9 +17,9 @@ import (
 	"reflect"
 
 	data "github.com/tendermint/go-wire/data"
-	"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/rpc/client"
+	"github.com/tendermint/tendermint/rpc/core"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/client/mock/status.go

@@ -1,8 +1,8 @@
 package mock
 
 import (
-	"github.com/tendermint/tendermint/rpc/tendermint/client"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	"github.com/tendermint/tendermint/rpc/client"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 // StatusMock returns the result specified by the Call

rpc/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-wire/data"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 
-	"github.com/tendermint/tendermint/rpc/tendermint/client/mock"
+	"github.com/tendermint/tendermint/rpc/client/mock"
 )
 
 func TestStatus(t *testing.T) {

rpc/client/rpc_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/merkleeyes/iavl"
 	merktest "github.com/tendermint/merkleeyes/testutil"
-	"github.com/tendermint/tendermint/rpc/tendermint/client"
-	rpctest "github.com/tendermint/tendermint/rpc/tendermint/test"
+	"github.com/tendermint/tendermint/rpc/client"
+	rpctest "github.com/tendermint/tendermint/rpc/test"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/core/abci.go

@@ -3,7 +3,7 @@ package core
 import (
 	abci "github.com/tendermint/abci/types"
 	data "github.com/tendermint/go-wire/data"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 //-----------------------------------------------------------------------------

rpc/core/blocks.go

@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 	. "github.com/tendermint/tmlibs/common"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/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/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/core/dev.go

@@ -6,7 +6,7 @@ import (
 	"runtime/pprof"
 	"strconv"
 
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 func UnsafeFlushMempool() (*ctypes.ResultUnsafeFlushMempool, error) {

rpc/core/events.go

@@ -1,8 +1,8 @@
 package core
 
 import (
-	"github.com/tendermint/tendermint/rpc/types"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	"github.com/tendermint/tendermint/rpc/lib/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/core/mempool.go

@@ -6,7 +6,7 @@ import (
 
 	abci "github.com/tendermint/abci/types"
 	data "github.com/tendermint/go-wire/data"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/core/net.go

@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 //-----------------------------------------------------------------------------

rpc/core/routes.go

@@ -2,9 +2,9 @@ package core
 
 import (
 	data "github.com/tendermint/go-wire/data"
-	rpc "github.com/tendermint/tendermint/rpc/server"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
-	"github.com/tendermint/tendermint/rpc/types"
+	rpc "github.com/tendermint/tendermint/rpc/lib/server"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
+	"github.com/tendermint/tendermint/rpc/lib/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/core/status.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	data "github.com/tendermint/go-wire/data"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/core/tx.go

@@ -3,7 +3,7 @@ package core
 import (
 	"fmt"
 
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/state/txindex/null"
 	"github.com/tendermint/tendermint/types"
 )

rpc/core/types/responses.go

@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/go-crypto"
 	data "github.com/tendermint/go-wire/data"
 	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/rpc/types"
+	"github.com/tendermint/tendermint/rpc/lib/types"
 	"github.com/tendermint/go-wire"
 	"github.com/tendermint/tendermint/types"
 )

rpc/grpc/api.go

@@ -1,7 +1,7 @@
 package core_grpc
 
 import (
-	core "github.com/tendermint/tendermint/rpc/tendermint/core"
+	core "github.com/tendermint/tendermint/rpc/core"
 
 	context "golang.org/x/net/context"
 )

rpc/lib/Dockerfile

@@ -0,0 +1,12 @@
+FROM golang:latest
+
+RUN mkdir -p /go/src/github.com/tendermint/tendermint/rpc/lib
+WORKDIR /go/src/github.com/tendermint/tendermint/rpc/lib
+
+COPY Makefile /go/src/github.com/tendermint/tendermint/rpc/lib/
+# COPY glide.yaml /go/src/github.com/tendermint/tendermint/rpc/lib/
+# COPY glide.lock /go/src/github.com/tendermint/tendermint/rpc/lib/
+
+COPY . /go/src/github.com/tendermint/tendermint/rpc/lib
+
+RUN make get_deps

rpc/lib/README.md

@@ -1,6 +1,6 @@
-# tendermint/rpc
+# tendermint/rpc/lib
 
-[![CircleCI](https://circleci.com/gh/tendermint/tendermint/rpc.svg?style=svg)](https://circleci.com/gh/tendermint/tendermint/rpc)
+[![CircleCI](https://circleci.com/gh/tendermint/tendermint/rpc/lib.svg?style=svg)](https://circleci.com/gh/tendermint/tendermint/rpc/lib)
 
 HTTP RPC server supporting calls via uri params, jsonrpc, and jsonrpc over websockets
 

rpc/lib/client/http_client.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/pkg/errors"
 	wire "github.com/tendermint/go-wire"
-	types "github.com/tendermint/tendermint/rpc/types"
+	types "github.com/tendermint/tendermint/rpc/lib/types"
 )
 
 // HTTPClient is a common interface for JSONRPCClient and URIClient.
@@ -27,7 +27,7 @@ func makeHTTPDialer(remoteAddr string) (string, func(string, string) (net.Conn,
 	parts := strings.SplitN(remoteAddr, "://", 2)
 	var protocol, address string
 	if len(parts) != 2 {
-		log.Warn("WARNING (tendermint/rpc): Please use fully formed listening addresses, including the tcp:// or unix:// prefix")
+		log.Warn("WARNING (tendermint/rpc/lib): Please use fully formed listening addresses, including the tcp:// or unix:// prefix")
 		protocol = types.SocketType(remoteAddr)
 		address = remoteAddr
 	} else {

rpc/lib/client/ws_client.go

@@ -9,7 +9,7 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 	cmn "github.com/tendermint/tmlibs/common"
-	types "github.com/tendermint/tendermint/rpc/types"
+	types "github.com/tendermint/tendermint/rpc/lib/types"
 	wire "github.com/tendermint/go-wire"
 )
 

rpc/lib/rpc_test.go

@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	wire "github.com/tendermint/go-wire"
-	client "github.com/tendermint/tendermint/rpc/client"
-	server "github.com/tendermint/tendermint/rpc/server"
-	types "github.com/tendermint/tendermint/rpc/types"
+	client "github.com/tendermint/tendermint/rpc/lib/client"
+	server "github.com/tendermint/tendermint/rpc/lib/server"
+	types "github.com/tendermint/tendermint/rpc/lib/types"
 )
 
 // Client and Server should work over tcp or unix sockets

rpc/lib/server/handlers.go

@@ -15,7 +15,7 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/pkg/errors"
 	wire "github.com/tendermint/go-wire"
-	types "github.com/tendermint/tendermint/rpc/types"
+	types "github.com/tendermint/tendermint/rpc/lib/types"
 	cmn "github.com/tendermint/tmlibs/common"
 	events "github.com/tendermint/tmlibs/events"
 )

rpc/lib/server/http_server.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	types "github.com/tendermint/tendermint/rpc/types"
+	types "github.com/tendermint/tendermint/rpc/lib/types"
 )
 
 func StartHTTPServer(listenAddr string, handler http.Handler) (listener net.Listener, err error) {
@@ -20,7 +20,7 @@ func StartHTTPServer(listenAddr string, handler http.Handler) (listener net.List
 	var proto, addr string
 	parts := strings.SplitN(listenAddr, "://", 2)
 	if len(parts) != 2 {
-		log.Warn("WARNING (tendermint/rpc): Please use fully formed listening addresses, including the tcp:// or unix:// prefix")
+		log.Warn("WARNING (tendermint/rpc/lib): Please use fully formed listening addresses, including the tcp:// or unix:// prefix")
 		// we used to allow addrs without tcp/unix prefix by checking for a colon
 		// TODO: Deprecate
 		proto = types.SocketType(listenAddr)

rpc/lib/test/main.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	cmn "github.com/tendermint/tmlibs/common"
-	rpcserver "github.com/tendermint/tendermint/rpc/server"
+	rpcserver "github.com/tendermint/tendermint/rpc/lib/server"
 )
 
 var routes = map[string]*rpcserver.RPCFunc{

rpc/test/client_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	abci "github.com/tendermint/abci/types"
-	rpc "github.com/tendermint/tendermint/rpc/client"
-	"github.com/tendermint/tendermint/rpc/tendermint/core"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
+	rpc "github.com/tendermint/tendermint/rpc/lib/client"
+	"github.com/tendermint/tendermint/rpc/core"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/state/txindex/null"
 	"github.com/tendermint/tendermint/types"
 	. "github.com/tendermint/tmlibs/common"

rpc/test/grpc_test.go

@@ -6,7 +6,7 @@ import (
 	"golang.org/x/net/context"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/rpc/tendermint/grpc"
+	"github.com/tendermint/tendermint/rpc/grpc"
 )
 
 //-------------------------------------------

rpc/test/helpers.go

@@ -18,9 +18,9 @@ import (
 	"github.com/tendermint/tendermint/config/tendermint_test"
 	nm "github.com/tendermint/tendermint/node"
 	"github.com/tendermint/tendermint/proxy"
-	client "github.com/tendermint/tendermint/rpc/client"
-	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
-	core_grpc "github.com/tendermint/tendermint/rpc/tendermint/grpc"
+	client "github.com/tendermint/tendermint/rpc/lib/client"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
+	core_grpc "github.com/tendermint/tendermint/rpc/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/tendermint/grpc"
+	"github.com/tendermint/tendermint/rpc/grpc"
 )
 
 var grpcAddr = "tcp://localhost:36656"