Revert test fixes

Author: Mak Muftic

gethrpc/client_test.go

@@ -203,36 +203,36 @@ func testClientCancel(transport string, t *testing.T) {
 	wg.Wait()
 }
 
-//func TestClientSubscribeInvalidArg(t *testing.T) {
-//	server := newTestServer()
-//	defer server.Stop()
-//	client := DialInProc(server)
-//	defer client.Close()
-//
-//	check := func(shouldPanic bool, arg interface{}) {
-//		defer func() {
-//			err := recover()
-//			if shouldPanic && err == nil {
-//				t.Errorf("EthSubscribe should've panicked for %#v", arg)
-//			}
-//			if !shouldPanic && err != nil {
-//				t.Errorf("EthSubscribe shouldn't have panicked for %#v", arg)
-//				buf := make([]byte, 1024*1024)
-//				buf = buf[:runtime.Stack(buf, false)]
-//				t.Error(err)
-//				t.Error(string(buf))
-//			}
-//		}()
-//		// todo
-//		// client.EthSubscribe(context.Background(), arg, "foo_bar")
-//	}
-//	check(true, nil)
-//	check(true, 1)
-//	check(true, (chan int)(nil))
-//	check(true, make(<-chan int))
-//	check(false, make(chan int))
-//	check(false, make(chan<- int))
-//}
+func TestClientSubscribeInvalidArg(t *testing.T) {
+	server := newTestServer()
+	defer server.Stop()
+	client := DialInProc(server)
+	defer client.Close()
+
+	check := func(shouldPanic bool, arg interface{}) {
+		defer func() {
+			err := recover()
+			if shouldPanic && err == nil {
+				t.Errorf("EthSubscribe should've panicked for %#v", arg)
+			}
+			if !shouldPanic && err != nil {
+				t.Errorf("EthSubscribe shouldn't have panicked for %#v", arg)
+				buf := make([]byte, 1024*1024)
+				buf = buf[:runtime.Stack(buf, false)]
+				t.Error(err)
+				t.Error(string(buf))
+			}
+		}()
+		// todo
+		client.EthSubscribe(context.Background(), arg, "foo_bar")
+	}
+	check(true, nil)
+	check(true, 1)
+	check(true, (chan int)(nil))
+	check(true, make(<-chan int))
+	check(false, make(chan int))
+	check(false, make(chan<- int))
+}
 
 func TestClientSubscribe(t *testing.T) {
 	server := newTestServer()
@@ -242,7 +242,7 @@ func TestClientSubscribe(t *testing.T) {
 
 	nc := make(chan int)
 	count := 10
-	sub, err := client.Subscribe(context.Background(), "nftest","someSubscription", "", "", nc, count, 0)
+	sub, err := client.Subscribe(context.Background(), "nftest", nc, "someSubscription", count, 0)
 
 	if err != nil {
 		t.Fatal("can't subscribe:", err)
@@ -288,8 +288,7 @@ func TestClientSubscribeClose(t *testing.T) {
 		err  error
 	)
 	go func() {
-		// todo
-		sub, err = client.Subscribe(context.Background(), "nftest2", "hangSubscription", "hangSubscription", "hangSubscription", nc)
+		sub, err = client.Subscribe(context.Background(), "nftest2", nc, "hangSubscription", 999)
 		errc <- err
 	}()
 
@@ -319,8 +318,7 @@ func TestClientCloseUnsubscribeRace(t *testing.T) {
 	for i := 0; i < 20; i++ {
 		client := DialInProc(server)
 		nc := make(chan int)
-		// todo
-		sub, err := client.Subscribe(context.Background(), "nftest", "someSubscription", "someSubscription", "someSubscription", nc)
+		sub, err := client.Subscribe(context.Background(), "nftest", nc, "someSubscription", 3, 1)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -349,8 +347,7 @@ func TestClientNotificationStorm(t *testing.T) {
 		// Subscribe on the server. It will start sending many notifications
 		// very quickly.
 		nc := make(chan int)
-		// todo
-		sub, err := client.Subscribe(ctx, "nftest", "someSubscribe", "", "", nc, count,  0)
+		sub, err := client.Subscribe(ctx, "nftest", nc, "someSubscription", count, 0)
 		if err != nil {
 			t.Fatal("can't subscribe:", err)
 		}

gethrpc/subscription_test.go

@@ -136,7 +136,7 @@ func TestServerUnsubscribe(t *testing.T) {
 	p2.SetDeadline(time.Now().Add(10 * time.Second))
 
 	// Subscribe.
-	p2.Write([]byte(`{"jsonrpc":"2.0","id":1,"method":"nftest2_someSubscription","params":[0,10]}`))
+	p2.Write([]byte(`{"jsonrpc":"2.0","id":1,"method":"nftest2_subscribe","params":["someSubscription",0,10]}`))
 
 	// Handle received messages.
 	resps := make(chan subConfirmation)
@@ -153,8 +153,7 @@ func TestServerUnsubscribe(t *testing.T) {
 	}
 
 	// Unsubscribe and check that it is handled on the server side.
-
-	p2.Write([]byte(fmt.Sprintf("{\"jsonrpc\":\"2.0\",\"method\":\"nftest2_unsubscribe\",\"params\":[\"%v\"]}", sub.subid)))
+	p2.Write([]byte(`{"jsonrpc":"2.0","method":"nftest2_unsubscribe","params":["` + sub.subid + `"]}`))
 	for {
 		select {
 		case id := <-service.unsubscribed:

gethrpc/websocket_test.go

@@ -130,7 +130,7 @@ func TestClientWebsocketPing(t *testing.T) {
 		t.Fatalf("client dial error: %v", err)
 	}
 	resultChan := make(chan int)
-	sub, err := client.Subscribe(ctx, "eth", "foo", "foo", "foo", resultChan)
+	sub, err := client.EthSubscribe(ctx, resultChan, "foo")
 	if err != nil {
 		t.Fatalf("client subscribe error: %v", err)
 	}