From b520bfbe96dce41d5fefbf88d2c06a150b262884 Mon Sep 17 00:00:00 2001
From: Adam Schmideg <adam@schmideg.net>
Date: Mon, 10 Feb 2020 11:50:42 +0100
Subject: [PATCH] Rephrase error message and omit test case covered elsewhere

---
 rpc/client.go      | 2 +-
 rpc/client_test.go | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/rpc/client.go b/rpc/client.go
index 1b6fd99a5d..984f56bc69 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -277,7 +277,7 @@ func (c *Client) Call(result interface{}, method string, args ...interface{}) er
 // can also pass nil, in which case the result is ignored.
 func (c *Client) CallContext(ctx context.Context, result interface{}, method string, args ...interface{}) error {
 	if result != nil && reflect.TypeOf(result).Kind() != reflect.Ptr {
-		return fmt.Errorf("Expected nil or pointer for result, got %v", result)
+		return fmt.Errorf("call result parameter must be pointer or nil interface: %v", result)
 	}
 	msg, err := c.newMessage(method, args...)
 	if err != nil {
diff --git a/rpc/client_test.go b/rpc/client_test.go
index 85c23496be..9c7f72053b 100644
--- a/rpc/client_test.go
+++ b/rpc/client_test.go
@@ -59,12 +59,6 @@ func TestClientResponseType(t *testing.T) {
 		t.Errorf("Passing nil as result should be fine, but got an error: %v", err)
 	}
 	var resultVar echoResult
-	if err := client.Call(&resultVar, "test_echo", "hello", 10, &echoArgs{"world"}); err != nil {
-		t.Errorf("Passing reference as result should be fine, but got an error: %v", err)
-	}
-	if resultVar.Int != 10 {
-		t.Errorf("Passing reference should work, but result is: %v", resultVar)
-	}
 	// Note: passing the var, not a ref
 	err := client.Call(resultVar, "test_echo", "hello", 10, &echoArgs{"world"})
 	if err == nil {