From 211d755aca93b27659614496b0e0f5aa8111a61e Mon Sep 17 00:00:00 2001
From: "M. J. Fromberger" <fromberger@interchain.io>
Date: Mon, 10 Jan 2022 11:20:30 -0800
Subject: [PATCH] rpc: remove positional parameter encoding from clients
 (#7545)

Apart from the tests for the websocket client, positional parameters are not
used by RPC clients. The server supports both arrays and objects, but the
client only needs to provide one or the other.
---
 rpc/jsonrpc/client/ws_client.go | 10 ----------
 rpc/jsonrpc/jsonrpc_test.go     | 31 -------------------------------
 rpc/jsonrpc/types/types.go      | 18 ------------------
 3 files changed, 59 deletions(-)

diff --git a/rpc/jsonrpc/client/ws_client.go b/rpc/jsonrpc/client/ws_client.go
index 98cff05ce..624b08776 100644
--- a/rpc/jsonrpc/client/ws_client.go
+++ b/rpc/jsonrpc/client/ws_client.go
@@ -224,16 +224,6 @@ func (c *WSClient) Call(ctx context.Context, method string, params map[string]in
 	return c.Send(ctx, request)
 }
 
-// CallWithArrayParams enqueues a call request onto the Send queue. Params are
-// in a form of array (e.g. []interface{}{"abcd"}). Requests are JSON encoded.
-func (c *WSClient) CallWithArrayParams(ctx context.Context, method string, params []interface{}) error {
-	request, err := rpctypes.ArrayToRequest(c.nextRequestID(), method, params)
-	if err != nil {
-		return err
-	}
-	return c.Send(ctx, request)
-}
-
 // Private methods
 
 func (c *WSClient) nextRequestID() rpctypes.JSONRPCIntID {
diff --git a/rpc/jsonrpc/jsonrpc_test.go b/rpc/jsonrpc/jsonrpc_test.go
index e43e14d42..3e1fbded1 100644
--- a/rpc/jsonrpc/jsonrpc_test.go
+++ b/rpc/jsonrpc/jsonrpc_test.go
@@ -329,37 +329,6 @@ func TestWSNewWSRPCFunc(t *testing.T) {
 	assert.Equal(t, got, val)
 }
 
-func TestWSHandlesArrayParams(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	cl, err := client.NewWS(tcpAddr, websocketEndpoint)
-	require.NoError(t, err)
-
-	cl.Logger = log.NewTestingLogger(t)
-	require.Nil(t, cl.Start(ctx))
-	t.Cleanup(func() {
-		if err := cl.Stop(); err != nil {
-			t.Error(err)
-		}
-	})
-
-	val := testVal
-	params := []interface{}{val}
-	err = cl.CallWithArrayParams(ctx, "echo_ws", params)
-	require.NoError(t, err)
-
-	msg := <-cl.ResponsesCh
-	if msg.Error != nil {
-		t.Fatalf("%+v", err)
-	}
-	result := new(ResultEcho)
-	err = json.Unmarshal(msg.Result, result)
-	require.NoError(t, err)
-	got := result.Value
-	assert.Equal(t, got, val)
-}
-
 // TestWSClientPingPong checks that a client & server exchange pings
 // & pongs so connection stays alive.
 func TestWSClientPingPong(t *testing.T) {
diff --git a/rpc/jsonrpc/types/types.go b/rpc/jsonrpc/types/types.go
index 74a4cc52b..617be7ebd 100644
--- a/rpc/jsonrpc/types/types.go
+++ b/rpc/jsonrpc/types/types.go
@@ -116,24 +116,6 @@ func MapToRequest(id jsonrpcid, method string, params map[string]interface{}) (R
 	return NewRPCRequest(id, method, payload), nil
 }
 
-func ArrayToRequest(id jsonrpcid, method string, params []interface{}) (RPCRequest, error) {
-	var paramsMap = make([]json.RawMessage, len(params))
-	for i, value := range params {
-		valueJSON, err := tmjson.Marshal(value)
-		if err != nil {
-			return RPCRequest{}, err
-		}
-		paramsMap[i] = valueJSON
-	}
-
-	payload, err := json.Marshal(paramsMap)
-	if err != nil {
-		return RPCRequest{}, err
-	}
-
-	return NewRPCRequest(id, method, payload), nil
-}
-
 //----------------------------------------
 // RESPONSE