rpc: use existing test framework for new error code tests

rpc/testdata/internal-error.js

@@ -0,0 +1,7 @@
+// These tests trigger various 'internal error' conditions.
+
+--> {"jsonrpc":"2.0","id":1,"method":"test_marshalError","params": []}
+<-- {"jsonrpc":"2.0","id":1,"error":{"code":-32603,"message":"json: error calling MarshalText for type *rpc.MarshalErrObj: marshal error"}}
+
+--> {"jsonrpc":"2.0","id":2,"method":"test_panic","params": []}
+<-- {"jsonrpc":"2.0","id":2,"error":{"code":-32603,"message":"method handler crashed"}}

rpc/websocket_test.go

@@ -25,7 +25,6 @@ import (
 	"net/http/httptest"
 	"net/http/httputil"
 	"net/url"
-	"reflect"
 	"strings"
 	"sync/atomic"
 	"testing"
@@ -228,62 +227,6 @@ func TestClientWebsocketLargeMessage(t *testing.T) {
 	}
 }
 
-func TestClientWebsocketInternalMarshalError(t *testing.T) {
-	var (
-		srv     = newTestServer()
-		httpsrv = httptest.NewServer(srv.WebsocketHandler(nil))
-		wsURL   = "ws:" + strings.TrimPrefix(httpsrv.URL, "http:")
-	)
-	defer srv.Stop()
-	defer httpsrv.Close()
-
-	c, err := DialWebsocket(context.Background(), wsURL, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var obj MarshalErrObj
-	err = c.Call(&obj, "test_marshalError")
-	if err == nil {
-		t.Fatal("test_marshalError call should return error")
-	}
-	jsonerror, ok := err.(*jsonError)
-	if !ok {
-		t.Fatalf("test_marshalError should reutrn jsonError, but %v found", reflect.TypeOf(err))
-	}
-	if jsonerror.Code != internalServerErrorCode {
-		t.Errorf("wrong error code %d, %d expected", jsonerror.Code, internalServerErrorCode)
-	}
-}
-
-func TestClientWebsocketInternalRPCPanic(t *testing.T) {
-	var (
-		srv     = newTestServer()
-		httpsrv = httptest.NewServer(srv.WebsocketHandler(nil))
-		wsURL   = "ws:" + strings.TrimPrefix(httpsrv.URL, "http:")
-	)
-	defer srv.Stop()
-	defer httpsrv.Close()
-
-	c, err := DialWebsocket(context.Background(), wsURL, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var r string
-	err = c.Call(&r, "test_panic")
-	if err == nil {
-		t.Fatal("test_panic call should return error")
-	}
-	jsonerror, ok := err.(*jsonError)
-	if !ok {
-		t.Fatalf("test_panic should reutrn jsonError, but %v found", reflect.TypeOf(err))
-	}
-	if jsonerror.Code != internalServerErrorCode {
-		t.Errorf("wrong error code %d, %d expected", jsonerror.Code, internalServerErrorCode)
-	}
-}
-
 func TestClientWebsocketSevered(t *testing.T) {
 	t.Parallel()