update import paths for repo merge

app/app.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	abci "github.com/tendermint/abci/types"
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-wire"
 	eyes "github.com/tendermint/merkleeyes/client"
 

app/genesis.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/tendermint/basecoin/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	//tmtypes "github.com/tendermint/tendermint/types"
 )
 
@@ -65,7 +65,7 @@ func loadGenesis(filePath string) (*FullGenesisDoc, error) {
 	// tmGenesis := new(tmtypes.GenesisDoc)
 	// err = wire.ReadJSONBytes(bytes, tmGenesis)
 
-	// the basecoin genesis go-data :)
+	// the basecoin genesis go-wire/data :)
 	genDoc := new(FullGenesisDoc)
 	err = json.Unmarshal(bytes, genDoc)
 	if err != nil {

app/genesis_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-crypto"
 	eyescli "github.com/tendermint/merkleeyes/client"
 )
@@ -52,7 +52,7 @@ func TestParseGenesisList(t *testing.T) {
 	bytes, err := cmn.ReadFile(genesisFilepath)
 	require.Nil(err, "loading genesis file %+v", err)
 
-	// the basecoin genesis go-data :)
+	// the basecoin genesis go-wire/data :)
 	genDoc := new(FullGenesisDoc)
 	err = json.Unmarshal(bytes, genDoc)
 	require.Nil(err, "unmarshaling genesis file %+v", err)

app/log.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"github.com/tendermint/go-logger"
+	"github.com/tendermint/tmlibs/logger"
 )
 
 var log = logger.New("module", "app")

cmd/commands/ibc.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/tendermint/basecoin/plugins/ibc"
 
-	"github.com/tendermint/go-merkle"
+	"github.com/tendermint/merkleeyes/iavl"
 	"github.com/tendermint/go-wire"
 	tmtypes "github.com/tendermint/tendermint/types"
 )

cmd/commands/init.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 //commands

cmd/commands/log.go

@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"github.com/tendermint/go-logger"
+	"github.com/tendermint/tmlibs/logger"
 )
 
 var log = logger.New("module", "commands")

cmd/commands/query.go

@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/tendermint/go-merkle"
+	"github.com/tendermint/merkleeyes/iavl"
 	"github.com/tendermint/go-wire"
 	tmtypes "github.com/tendermint/tendermint/types"
 )

cmd/commands/start.go

@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/tendermint/abci/server"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	eyes "github.com/tendermint/merkleeyes/client"
 
 	tmcfg "github.com/tendermint/tendermint/config/tendermint"

cmd/commands/tx.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/tendermint/basecoin/types"
 
-	client "github.com/tendermint/go-rpc/client"
+	client "github.com/tendermint/tendermint/rpc/client"
 	wire "github.com/tendermint/go-wire"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )

cmd/commands/utils.go

@@ -14,8 +14,8 @@ import (
 	"github.com/tendermint/basecoin/types"
 
 	abci "github.com/tendermint/abci/types"
-	cmn "github.com/tendermint/go-common"
-	client "github.com/tendermint/go-rpc/client"
+	cmn "github.com/tendermint/tmlibs/common"
+	client "github.com/tendermint/tendermint/rpc/client"
 	wire "github.com/tendermint/go-wire"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	tmtypes "github.com/tendermint/tendermint/types"

plugins/ibc/ibc.go

@@ -8,8 +8,8 @@ import (
 
 	abci "github.com/tendermint/abci/types"
 	"github.com/tendermint/basecoin/types"
-	cmn "github.com/tendermint/go-common"
-	merkle "github.com/tendermint/go-merkle"
+	cmn "github.com/tendermint/tmlibs/common"
+	merkle "github.com/tendermint/merkleeyes/iavl"
 	"github.com/tendermint/go-wire"
 	tm "github.com/tendermint/tendermint/types"
 )

plugins/ibc/ibc_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	abci "github.com/tendermint/abci/types"
 	"github.com/tendermint/basecoin/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	crypto "github.com/tendermint/go-crypto"
-	"github.com/tendermint/go-merkle"
+	"github.com/tendermint/merkleeyes/iavl"
 	"github.com/tendermint/go-wire"
 	eyes "github.com/tendermint/merkleeyes/client"
 	tm "github.com/tendermint/tendermint/types"

scripts/print_txs.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	cmn "github.com/tendermint/go-common"
-	"github.com/tendermint/go-rpc/client"
-	"github.com/tendermint/go-rpc/types"
+	cmn "github.com/tendermint/tmlibs/common"
+	"github.com/tendermint/tendermint/rpc/client"
+	"github.com/tendermint/tendermint/rpc/types"
 	"github.com/tendermint/go-wire"
 	_ "github.com/tendermint/tendermint/rpc/core/types" // Register RPCResponse > Result types
 )

state/execution.go

@@ -3,8 +3,8 @@ package state
 import (
 	abci "github.com/tendermint/abci/types"
 	"github.com/tendermint/basecoin/types"
-	cmn "github.com/tendermint/go-common"
-	"github.com/tendermint/go-events"
+	cmn "github.com/tendermint/tmlibs/common"
+	"github.com/tendermint/tmlibs/events"
 )
 
 // If the tx is invalid, a TMSP error will be returned.

state/log.go

@@ -1,7 +1,7 @@
 package state
 
 import (
-	"github.com/tendermint/go-logger"
+	"github.com/tendermint/tmlibs/logger"
 )
 
 var log = logger.New("module", "state")

state/state.go

@@ -3,7 +3,7 @@ package state
 import (
 	abci "github.com/tendermint/abci/types"
 	"github.com/tendermint/basecoin/types"
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-wire"
 	eyes "github.com/tendermint/merkleeyes/client"
 )

tests/tendermint/main.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/tendermint/basecoin/types"
-	cmn "github.com/tendermint/go-common"
-	"github.com/tendermint/go-rpc/client"
-	"github.com/tendermint/go-rpc/types"
+	cmn "github.com/tendermint/tmlibs/common"
+	"github.com/tendermint/tendermint/rpc/client"
+	"github.com/tendermint/tendermint/rpc/types"
 	wire "github.com/tendermint/go-wire"
 	_ "github.com/tendermint/tendermint/rpc/core/types" // Register RPCResponse > Result types
 )

tests/tmsp/tmsp_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/basecoin/app"
 	"github.com/tendermint/basecoin/types"
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-wire"
 	eyescli "github.com/tendermint/merkleeyes/client"
 )

types/kvstore.go

@@ -4,7 +4,7 @@ import (
 	"container/list"
 	"fmt"
 
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 )
 
 type KVStore interface {

types/test_helpers.go

@@ -3,7 +3,7 @@ package types
 // Helper functions for testing
 
 import (
-	cmn "github.com/tendermint/go-common"
+	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-crypto"
 )
 

types/tx.go

@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 
 	abci "github.com/tendermint/abci/types"
-	. "github.com/tendermint/go-common"
+	. "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/go-crypto"
-	"github.com/tendermint/go-data"
+	"github.com/tendermint/go-wire/data"
 	"github.com/tendermint/go-wire"
 )
 
@@ -37,7 +37,7 @@ func (_ *AppTx) AssertIsTx()  {}
 
 var txMapper data.Mapper
 
-// register both private key types with go-data (and thus go-wire)
+// register both private key types with go-wire/data (and thus go-wire)
 func init() {
 	txMapper = data.NewMapper(TxS{}).
 		RegisterImplementation(&SendTx{}, TxNameSend, TxTypeSend).

types/tx_test.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	cmn "github.com/tendermint/go-common"
-	data "github.com/tendermint/go-data"
+	cmn "github.com/tendermint/tmlibs/common"
+	data "github.com/tendermint/go-wire/data"
 )
 
 var chainID string = "test_chain"