Browse Source

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

pull/462/head
Ethan Buchman 8 years ago
parent
commit
cc6dde96c1
60 changed files with 78 additions and 78 deletions
  1. +1
    -1
      benchmarks/codec_test.go
  2. +3
    -3
      benchmarks/simu/counter.go
  3. +4
    -4
      node/node.go
  4. +0
    -12
      rpc/Dockerfile
  5. +1
    -1
      rpc/client/event_test.go
  6. +0
    -0
      rpc/client/helpers.go
  7. +3
    -3
      rpc/client/helpers_test.go
  8. +2
    -2
      rpc/client/httpclient.go
  9. +1
    -1
      rpc/client/interface.go
  10. +2
    -2
      rpc/client/localclient.go
  11. +1
    -1
      rpc/client/main_test.go
  12. +2
    -2
      rpc/client/mock/abci.go
  13. +2
    -2
      rpc/client/mock/abci_test.go
  14. +3
    -3
      rpc/client/mock/client.go
  15. +2
    -2
      rpc/client/mock/status.go
  16. +2
    -2
      rpc/client/mock/status_test.go
  17. +2
    -2
      rpc/client/rpc_test.go
  18. +1
    -1
      rpc/core/abci.go
  19. +1
    -1
      rpc/core/blocks.go
  20. +1
    -1
      rpc/core/consensus.go
  21. +1
    -1
      rpc/core/dev.go
  22. +2
    -2
      rpc/core/events.go
  23. +0
    -0
      rpc/core/log.go
  24. +1
    -1
      rpc/core/mempool.go
  25. +1
    -1
      rpc/core/net.go
  26. +0
    -0
      rpc/core/pipe.go
  27. +3
    -3
      rpc/core/routes.go
  28. +1
    -1
      rpc/core/status.go
  29. +1
    -1
      rpc/core/tx.go
  30. +1
    -1
      rpc/core/types/responses.go
  31. +0
    -0
      rpc/core/types/responses_test.go
  32. +0
    -0
      rpc/core/version.go
  33. +1
    -1
      rpc/grpc/api.go
  34. +0
    -0
      rpc/grpc/client_server.go
  35. +0
    -0
      rpc/grpc/compile.sh
  36. +0
    -0
      rpc/grpc/types.pb.go
  37. +0
    -0
      rpc/grpc/types.proto
  38. +12
    -0
      rpc/lib/Dockerfile
  39. +0
    -0
      rpc/lib/Makefile
  40. +2
    -2
      rpc/lib/README.md
  41. +0
    -0
      rpc/lib/circle.yml
  42. +0
    -0
      rpc/lib/client/args_test.go
  43. +2
    -2
      rpc/lib/client/http_client.go
  44. +0
    -0
      rpc/lib/client/log.go
  45. +1
    -1
      rpc/lib/client/ws_client.go
  46. +3
    -3
      rpc/lib/rpc_test.go
  47. +1
    -1
      rpc/lib/server/handlers.go
  48. +0
    -0
      rpc/lib/server/http_params.go
  49. +2
    -2
      rpc/lib/server/http_server.go
  50. +0
    -0
      rpc/lib/server/log.go
  51. +0
    -0
      rpc/lib/test/data.json
  52. +0
    -0
      rpc/lib/test/integration_test.sh
  53. +1
    -1
      rpc/lib/test/main.go
  54. +0
    -0
      rpc/lib/types/types.go
  55. +0
    -0
      rpc/lib/version.go
  56. +3
    -3
      rpc/test/client_test.go
  57. +1
    -1
      rpc/test/grpc_test.go
  58. +3
    -3
      rpc/test/helpers.go
  59. +0
    -0
      rpc/test/main_test.go
  60. +1
    -1
      test/app/grpc_client.go

+ 1
- 1
benchmarks/codec_test.go View File

@ -7,7 +7,7 @@ import (
"github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p"
"github.com/tendermint/go-wire" "github.com/tendermint/go-wire"
proto "github.com/tendermint/tendermint/benchmarks/proto" 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) { func BenchmarkEncodeStatusWire(b *testing.B) {


+ 3
- 3
benchmarks/simu/counter.go View File

@ -8,10 +8,10 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
. "github.com/tendermint/tmlibs/common" . "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/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() { func main() {


+ 4
- 4
node/node.go View File

@ -17,10 +17,10 @@ import (
mempl "github.com/tendermint/tendermint/mempool" mempl "github.com/tendermint/tendermint/mempool"
p2p "github.com/tendermint/tendermint/p2p" p2p "github.com/tendermint/tendermint/p2p"
"github.com/tendermint/tendermint/proxy" "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" sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/state/txindex" "github.com/tendermint/tendermint/state/txindex"
"github.com/tendermint/tendermint/state/txindex/kv" "github.com/tendermint/tendermint/state/txindex/kv"


+ 0
- 12
rpc/Dockerfile View File

@ -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/tendermint/client/event_test.go → rpc/client/event_test.go View File


rpc/tendermint/client/helpers.go → rpc/client/helpers.go View File


rpc/tendermint/client/helpers_test.go → rpc/client/helpers_test.go View File


rpc/tendermint/client/httpclient.go → rpc/client/httpclient.go View File


rpc/tendermint/client/interface.go → rpc/client/interface.go View File


rpc/tendermint/client/localclient.go → rpc/client/localclient.go View File


rpc/tendermint/client/main_test.go → rpc/client/main_test.go View File


rpc/tendermint/client/mock/abci.go → rpc/client/mock/abci.go View File


rpc/tendermint/client/mock/abci_test.go → rpc/client/mock/abci_test.go View File


rpc/tendermint/client/mock/client.go → rpc/client/mock/client.go View File


rpc/tendermint/client/mock/status.go → rpc/client/mock/status.go View File


rpc/tendermint/client/mock/status_test.go → rpc/client/mock/status_test.go View File


rpc/tendermint/client/rpc_test.go → rpc/client/rpc_test.go View File


rpc/tendermint/core/abci.go → rpc/core/abci.go View File


rpc/tendermint/core/blocks.go → rpc/core/blocks.go View File


rpc/tendermint/core/consensus.go → rpc/core/consensus.go View File


rpc/tendermint/core/dev.go → rpc/core/dev.go View File


rpc/tendermint/core/events.go → rpc/core/events.go View File


rpc/tendermint/core/log.go → rpc/core/log.go View File


rpc/tendermint/core/mempool.go → rpc/core/mempool.go View File


rpc/tendermint/core/net.go → rpc/core/net.go View File


rpc/tendermint/core/pipe.go → rpc/core/pipe.go View File


rpc/tendermint/core/routes.go → rpc/core/routes.go View File


rpc/tendermint/core/status.go → rpc/core/status.go View File


rpc/tendermint/core/tx.go → rpc/core/tx.go View File


rpc/tendermint/core/types/responses.go → rpc/core/types/responses.go View File


rpc/tendermint/core/types/responses_test.go → rpc/core/types/responses_test.go View File


rpc/tendermint/core/version.go → rpc/core/version.go View File


rpc/tendermint/grpc/api.go → rpc/grpc/api.go View File


rpc/tendermint/grpc/client_server.go → rpc/grpc/client_server.go View File


rpc/tendermint/grpc/compile.sh → rpc/grpc/compile.sh View File


rpc/tendermint/grpc/types.pb.go → rpc/grpc/types.pb.go View File


rpc/tendermint/grpc/types.proto → rpc/grpc/types.proto View File


+ 12
- 0
rpc/lib/Dockerfile View File

@ -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/Makefile → rpc/lib/Makefile View File


rpc/README.md → rpc/lib/README.md View File


rpc/circle.yml → rpc/lib/circle.yml View File


rpc/client/args_test.go → rpc/lib/client/args_test.go View File


rpc/client/http_client.go → rpc/lib/client/http_client.go View File


rpc/client/log.go → rpc/lib/client/log.go View File


rpc/client/ws_client.go → rpc/lib/client/ws_client.go View File


rpc/rpc_test.go → rpc/lib/rpc_test.go View File


rpc/server/handlers.go → rpc/lib/server/handlers.go View File


rpc/server/http_params.go → rpc/lib/server/http_params.go View File


rpc/server/http_server.go → rpc/lib/server/http_server.go View File


rpc/server/log.go → rpc/lib/server/log.go View File


rpc/test/data.json → rpc/lib/test/data.json View File


rpc/test/integration_test.sh → rpc/lib/test/integration_test.sh View File


rpc/test/main.go → rpc/lib/test/main.go View File


rpc/types/types.go → rpc/lib/types/types.go View File


rpc/version.go → rpc/lib/version.go View File


rpc/tendermint/test/client_test.go → rpc/test/client_test.go View File


rpc/tendermint/test/grpc_test.go → rpc/test/grpc_test.go View File


rpc/tendermint/test/helpers.go → rpc/test/helpers.go View File


rpc/tendermint/test/main_test.go → rpc/test/main_test.go View File


+ 1
- 1
test/app/grpc_client.go View File

@ -8,7 +8,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
"github.com/tendermint/go-wire" "github.com/tendermint/go-wire"
"github.com/tendermint/tendermint/rpc/tendermint/grpc"
"github.com/tendermint/tendermint/rpc/grpc"
) )
var grpcAddr = "tcp://localhost:36656" var grpcAddr = "tcp://localhost:36656"


Loading…
Cancel
Save