From f7f4ba5e90a76cb17bb251e6bcd68c19ac841dc7 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 31 Oct 2017 15:41:25 -0400
Subject: [PATCH] rpc/lib/server: minor changes to test

---
 rpc/lib/server/handlers_test.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/rpc/lib/server/handlers_test.go b/rpc/lib/server/handlers_test.go
index 2260f73d3..664bbd917 100644
--- a/rpc/lib/server/handlers_test.go
+++ b/rpc/lib/server/handlers_test.go
@@ -40,15 +40,18 @@ func TestRPCParams(t *testing.T) {
 		payload string
 		wantErr string
 	}{
+		// bad
 		{`{"jsonrpc": "2.0", "id": "0"}`, "Method not found"},
 		{`{"jsonrpc": "2.0", "method": "y", "id": "0"}`, "Method not found"},
-		{`{"jsonrpc": "2.0", "method": "c", "id": "0", "params": null}`, ""},
-		{`{"method": "c", "id": "0", "params": {}}`, ""},
 		{`{"method": "c", "id": "0", "params": a}`, "invalid character"},
-		{`{"method": "c", "id": "0", "params": ["a", 10]}`, ""},
 		{`{"method": "c", "id": "0", "params": ["a"]}`, "got 1"},
 		{`{"method": "c", "id": "0", "params": ["a", "b"]}`, "of type int"},
 		{`{"method": "c", "id": "0", "params": [1, 1]}`, "of type string"},
+
+		// good
+		{`{"jsonrpc": "2.0", "method": "c", "id": "0", "params": null}`, ""},
+		{`{"method": "c", "id": "0", "params": {}}`, ""},
+		{`{"method": "c", "id": "0", "params": ["a", 10]}`, ""},
 	}
 
 	for i, tt := range tests {
@@ -71,7 +74,7 @@ func TestRPCParams(t *testing.T) {
 		if tt.wantErr == "" {
 			assert.Nil(t, recv.Error, "#%d: not expecting an error", i)
 		} else {
-			assert.False(t, statusOK(recv.Error.Code), "#%d: not expecting a 2XX success code", i)
+			assert.True(t, recv.Error.Code < 0, "#%d: not expecting a positive JSONRPC code", i)
 			// The wanted error is either in the message or the data
 			assert.Contains(t, recv.Error.Message+recv.Error.Data, tt.wantErr, "#%d: expected substring", i)
 		}