fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-15 22:31:21 +00:00
Code Issues Projects Releases Wiki Activity

rename rpc function status to echo

Browse Source 
echo means we're returning the input, which is exactly what this
function does.
This commit is contained in:
Anton Kaliaev
2017-03-10 12:57:14 +04:00
parent 0874c72819
commit c88257b038
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
rpc_test.go
View File

@ -31,38 +31,37 @@ const (
// Define a type for results and register concrete versions // Define a type for results and register concrete versions
type Result interface{} type Result interface{}
type ResultStatus struct { type ResultEcho struct {
Value string Value string
} }
type ResultBytes struct { type ResultEchoBytes struct {
Value []byte Value []byte
} }
var _ = wire.RegisterInterface( var _ = wire.RegisterInterface(
struct{ Result }{}, struct{ Result }{},
wire.ConcreteType{&ResultStatus{}, 0x1}, wire.ConcreteType{&ResultEcho{}, 0x1},
wire.ConcreteType{&ResultBytes{}, 0x2}, wire.ConcreteType{&ResultEchoBytes{}, 0x2},
) )
// Define some routes // Define some routes
var Routes = map[string]*server.RPCFunc{ var Routes = map[string]*server.RPCFunc{
"status": server.NewRPCFunc(StatusResult, "arg"), "echo": server.NewRPCFunc(EchoResult, "arg"),
"status_ws": server.NewWSRPCFunc(StatusWSResult, "arg"), "echo_ws": server.NewWSRPCFunc(EchoWSResult, "arg"),
"bytes": server.NewRPCFunc(BytesResult, "arg"), "echo_bytes": server.NewRPCFunc(EchoBytesResult, "arg"),
} }
// an rpc function func EchoResult(v string) (Result, error) {
func StatusResult(v string) (Result, error) { return &ResultEcho{v}, nil
return &ResultStatus{v}, nil
} }
func StatusWSResult(wsCtx types.WSRPCContext, v string) (Result, error) { func EchoWSResult(wsCtx types.WSRPCContext, v string) (Result, error) {
return &ResultStatus{v}, nil return &ResultEcho{v}, nil
} }
func BytesResult(v []byte) (Result, error) { func EchoBytesResult(v []byte) (Result, error) {
return &ResultBytes{v}, nil return &ResultEchoBytes{v}, nil
} }
// launch unix and tcp servers // launch unix and tcp servers
@ -101,20 +100,20 @@ func init() {
} }
func status(cl client.HTTPClient, val string) (string, error) { func echo(cl client.HTTPClient, val string) (string, error) {
params := map[string]interface{}{ params := map[string]interface{}{
"arg": val, "arg": val,
} }
var result Result var result Result
if _, err := cl.Call("status", params, &result); err != nil { if _, err := cl.Call("echo", params, &result); err != nil {
return "", err return "", err
} }
return result.(*ResultStatus).Value, nil return result.(*ResultEcho).Value, nil
} }
func testWithHTTPClient(t *testing.T, cl client.HTTPClient) { func testWithHTTPClient(t *testing.T, cl client.HTTPClient) {
val := "acbd" val := "acbd"
got, err := status(cl, val) got, err := echo(cl, val)
require.Nil(t, err) require.Nil(t, err)
assert.Equal(t, got, val) assert.Equal(t, got, val)
} }
@ -127,7 +126,7 @@ func testWithWSClient(t *testing.T, cl *client.WSClient) {
err := cl.WriteJSON(types.RPCRequest{ err := cl.WriteJSON(types.RPCRequest{
JSONRPC: "2.0", JSONRPC: "2.0",
ID: "", ID: "",
Method: "status", Method: "echo",
Params: params, Params: params,
}) })
require.Nil(t, err) require.Nil(t, err)
@ -137,7 +136,7 @@ func testWithWSClient(t *testing.T, cl *client.WSClient) {
result := new(Result) result := new(Result)
wire.ReadJSONPtr(result, msg, &err) wire.ReadJSONPtr(result, msg, &err)
require.Nil(t, err) require.Nil(t, err)
got := (*result).(*ResultStatus).Value got := (*result).(*ResultEcho).Value
assert.Equal(t, got, val) assert.Equal(t, got, val)
case err := <-cl.ErrorsCh: case err := <-cl.ErrorsCh:
t.Fatal(err) t.Fatal(err)
@ -170,7 +169,7 @@ func TestHexStringArg(t *testing.T) {
cl := client.NewURIClient(tcpAddr) cl := client.NewURIClient(tcpAddr)
// should NOT be handled as hex // should NOT be handled as hex
val := "0xabc" val := "0xabc"
got, err := status(cl, val) got, err := echo(cl, val)
require.Nil(t, err) require.Nil(t, err)
assert.Equal(t, got, val) assert.Equal(t, got, val)
} }
@ -179,7 +178,7 @@ func TestQuotedStringArg(t *testing.T) {
cl := client.NewURIClient(tcpAddr) cl := client.NewURIClient(tcpAddr)
// should NOT be unquoted // should NOT be unquoted
val := "\"abc\"" val := "\"abc\""
got, err := status(cl, val) got, err := echo(cl, val)
require.Nil(t, err) require.Nil(t, err)
assert.Equal(t, got, val) assert.Equal(t, got, val)
} }
@ -200,9 +199,9 @@ func TestByteSliceViaJSONRPC(t *testing.T) {
"arg": val, "arg": val,
} }
var result Result var result Result
_, err := cl.Call("bytes", params, &result) _, err := cl.Call("echo_bytes", params, &result)
require.Nil(t, err) require.Nil(t, err)
got := result.(*ResultBytes).Value got := result.(*ResultEchoBytes).Value
assert.Equal(t, got, val) assert.Equal(t, got, val)
} }
@ -219,7 +218,7 @@ func TestWSNewWSRPCFunc(t *testing.T) {
err = cl.WriteJSON(types.RPCRequest{ err = cl.WriteJSON(types.RPCRequest{
JSONRPC: "2.0", JSONRPC: "2.0",
ID: "", ID: "",
Method: "status_ws", Method: "echo_ws",
Params: params, Params: params,
}) })
require.Nil(t, err) require.Nil(t, err)
@ -229,7 +228,7 @@ func TestWSNewWSRPCFunc(t *testing.T) {
result := new(Result) result := new(Result)
wire.ReadJSONPtr(result, msg, &err) wire.ReadJSONPtr(result, msg, &err)
require.Nil(t, err) require.Nil(t, err)
got := (*result).(*ResultStatus).Value got := (*result).(*ResultEcho).Value
assert.Equal(t, got, val) assert.Equal(t, got, val)
case err := <-cl.ErrorsCh: case err := <-cl.ErrorsCh:
t.Fatal(err) t.Fatal(err)