go-kosu: remove rpc.Client

packages/go-kosu/rpc/rpc_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -17,29 +18,40 @@ import (
 func TestRPCLatestHeight(t *testing.T) {
 	_, closer := tests.StartServer(t, db.NewMemDB())
 	defer closer()
-	client := DialInProc(
+	client := rpc.DialInProc(
 		NewServer(
 			abci.NewHTTPClient("http://localhost:26657", nil),
 		),
 	)
 
+	var latest uint64
 	// Get the initial (prior the first block is mined)
-	latest, err := client.LatestHeight()
-	require.NoError(t, err)
+	require.NoError(t, client.Call(&latest, "kosu_latestHeight"))
 	assert.EqualValues(t, 0, latest)
 
 	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
 	fn := func(i interface{}) {
 		// this is invoked when a block is mined
-		latest, err := client.LatestHeight()
-		require.NoError(t, err)
+		require.NoError(t, client.Call(&latest, "kosu_latestHeight"))
 		assert.EqualValues(t, 1, latest)
-
 		cancel()
 	}
 
-	err = client.Subscribe(ctx, fn, "tm.event = 'NewBlock'")
+	ch := make(chan interface{})
+	defer close(ch)
+
+	sub, err := client.Subscribe(ctx, "kosu", ch, "subscribe", "tm.event = 'NewBlock'")
+	defer sub.Unsubscribe()
 	require.NoError(t, err)
 
-	<-ctx.Done()
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		case err := <-sub.Err():
+			t.Error(err)
+		case e := <-ch:
+			fn(e)
+		}
+	}
 }