finalize HTTPClient events interface

rpc/client/helpers.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/tendermint/tendermint/types"
 )
 
@@ -61,17 +60,8 @@ func WaitForOneEvent(c EventsClient, evtTyp string, timeout time.Duration) (type
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	eventCh := make(chan *ctypes.ResultEvent, 1)
-	errCh := make(chan error, 1)
-	callback := func(event *ctypes.ResultEvent, err error) {
-		if err != nil {
-			errCh <- err
-		} else {
-			eventCh <- event
-		}
-	}
 	// register for the next event of this type
-	err := c.Subscribe(ctx, subscriber, types.QueryForEvent(evtTyp).String(), callback)
+	eventCh, err := c.Subscribe(ctx, subscriber, types.QueryForEvent(evtTyp).String())
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to subscribe")
 	}
@@ -81,8 +71,6 @@ func WaitForOneEvent(c EventsClient, evtTyp string, timeout time.Duration) (type
 	select {
 	case event := <-eventCh:
 		return event.Data.(types.TMEventData), nil
-	case err := <-errCh:
-		return nil, err
 	case <-ctx.Done():
 		return nil, errors.New("timed out waiting for event")
 	}