Clean up event switch add helper function

rpc/client/event_test.go

@@ -6,14 +6,14 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	events "github.com/tendermint/go-events"
+	merktest "github.com/tendermint/merkleeyes/testutil"
+	"github.com/tendermint/tendermint/rpc/client"
 	"github.com/tendermint/tendermint/types"
 )
 
-func TestEvents(t *testing.T) {
+func TestHeaderEvents(t *testing.T) {
 	require := require.New(t)
 	for i, c := range GetClients() {
-		// for i, c := range []client.Client{getLocalClient()} {
 		// test if this client implements event switch as well.
 		evsw, ok := c.(types.EventSwitch)
 		if !assert.True(t, ok, "%d: %v", i, c) {
@@ -29,31 +29,50 @@ func TestEvents(t *testing.T) {
 			defer evsw.Stop()
 		}
 
-		// let's wait for the next header...
-		listener := "fooz"
-		event, timeout := make(chan events.EventData, 10), make(chan bool, 1)
-		// start timeout count-down
-		go func() {
-			time.Sleep(1 * time.Second)
-			timeout <- true
-		}()
-
-		// register for the next header event
 		evtTyp := types.EventStringNewBlockHeader()
-		evsw.AddListenerForEvent(listener, evtTyp, func(data events.EventData) {
-			event <- data
-		})
-		// make sure to unregister after the test is over
-		// TODO: don't require both!
-		defer evsw.RemoveListenerForEvent(listener, evtTyp)
-		defer evsw.RemoveListener(listener)
-
-		select {
-		case <-timeout:
-			require.True(false, "%d: a timeout waiting for event", i)
-		case evt := <-event:
-			_, ok := evt.(types.EventDataNewBlockHeader)
-			require.True(ok, "%d: %#v", i, evt)
-		}
+		evt, err := client.WaitForOneEvent(evsw, evtTyp, 1*time.Second)
+		require.Nil(err, "%d: %+v", i, err)
+		_, ok = evt.(types.EventDataNewBlockHeader)
+		require.True(ok, "%d: %#v", i, evt)
+		// TODO: more checks...
+	}
+}
+
+func TestTxEvents(t *testing.T) {
+	require := require.New(t)
+	for i, c := range GetClients() {
+		// test if this client implements event switch as well.
+		evsw, ok := c.(types.EventSwitch)
+		if !assert.True(t, ok, "%d: %v", i, c) {
+			continue
+		}
+
+		// start for this test it if it wasn't already running
+		if !evsw.IsRunning() {
+			// if so, then we start it, listen, and stop it.
+			st, err := evsw.Start()
+			require.Nil(err, "%d: %+v", i, err)
+			require.True(st, "%d", i)
+			defer evsw.Stop()
+		}
+
+		// make the tx
+		_, _, tx := merktest.MakeTxKV()
+		evtTyp := types.EventStringTx(types.Tx(tx))
+
+		// send async
+		txres, err := c.BroadcastTxAsync(tx)
+		require.Nil(err, "%+v", err)
+		require.True(txres.Code.IsOK())
+
+		// and wait for confirmation
+		evt, err := client.WaitForOneEvent(evsw, evtTyp, 1*time.Second)
+		require.Nil(err, "%d: %+v", i, err)
+		// and make sure it has the proper info
+		txe, ok := evt.(types.EventDataTx)
+		require.True(ok, "%d: %#v", i, evt)
+		// make sure this is the proper tx
+		require.EqualValues(tx, txe.Tx)
+		require.True(txe.Code.IsOK())
 	}
 }