use tmlibs

rpc/tendermint/client/helpers.go

@@ -4,8 +4,8 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	cmn "github.com/tendermint/go-common"
-	events "github.com/tendermint/go-events"
+	cmn "github.com/tendermint/tmlibs/common"
+	events "github.com/tendermint/tmlibs/events"
 	"github.com/tendermint/tendermint/types"
 )
 

rpc/tendermint/client/httpclient.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/pkg/errors"
 	data "github.com/tendermint/go-data"
-	events "github.com/tendermint/go-events"
+	events "github.com/tendermint/tmlibs/events"
 	"github.com/tendermint/go-rpc/client"
 	wire "github.com/tendermint/go-wire"
 	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
@@ -198,7 +198,7 @@ type WSEvents struct {
 	// used to maintain counts of actively listened events
 	// so we can properly subscribe/unsubscribe
 	// FIXME: thread-safety???
-	// FIXME: reuse code from go-events???
+	// FIXME: reuse code from tmlibs/events???
 	evtCount  map[string]int      // count how many time each event is subscribed
 	listeners map[string][]string // keep track of which events each listener is listening to
 }

rpc/tendermint/core/blocks.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"fmt"
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"
 	"github.com/tendermint/tendermint/types"
 )

rpc/tendermint/grpc/client_server.go

@@ -8,7 +8,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 )
 
 // Start the grpcServer in a go routine

rpc/tendermint/test/client_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/abci/types"
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	rpc "github.com/tendermint/go-rpc/client"
 	"github.com/tendermint/tendermint/rpc/tendermint/core"
 	ctypes "github.com/tendermint/tendermint/rpc/tendermint/core/types"

rpc/tendermint/test/helpers.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	logger "github.com/tendermint/go-logger"
+	logger "github.com/tendermint/tmlibs/logger"
 	wire "github.com/tendermint/go-wire"
 
 	abci "github.com/tendermint/abci/types"