From 1a6fae6af6339ad616f2907df591370996155d5a Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 26 Apr 2017 01:08:31 -0400 Subject: [PATCH] update import paths for repo merge --- app/app.go | 2 +- app/genesis.go | 4 ++-- app/genesis_test.go | 4 ++-- app/log.go | 2 +- cmd/commands/ibc.go | 2 +- cmd/commands/init.go | 2 +- cmd/commands/log.go | 2 +- cmd/commands/query.go | 2 +- cmd/commands/start.go | 2 +- cmd/commands/tx.go | 2 +- cmd/commands/utils.go | 4 ++-- plugins/ibc/ibc.go | 4 ++-- plugins/ibc/ibc_test.go | 4 ++-- scripts/print_txs.go | 6 +++--- state/execution.go | 4 ++-- state/log.go | 2 +- state/state.go | 2 +- tests/tendermint/main.go | 6 +++--- tests/tmsp/tmsp_test.go | 2 +- types/kvstore.go | 2 +- types/test_helpers.go | 2 +- types/tx.go | 6 +++--- types/tx_test.go | 4 ++-- 23 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/app.go b/app/app.go index fe17736697..3a28f7f7ea 100644 --- a/app/app.go +++ b/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" diff --git a/app/genesis.go b/app/genesis.go index ad8b2b6c9e..e4d838de2d 100644 --- a/app/genesis.go +++ b/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 { diff --git a/app/genesis_test.go b/app/genesis_test.go index 4fec4b6db7..df47827465 100644 --- a/app/genesis_test.go +++ b/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) diff --git a/app/log.go b/app/log.go index 52dc2ddfa4..1337bcdfc6 100644 --- a/app/log.go +++ b/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") diff --git a/cmd/commands/ibc.go b/cmd/commands/ibc.go index 8b0938826b..bd3efe5ea8 100644 --- a/cmd/commands/ibc.go +++ b/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" ) diff --git a/cmd/commands/init.go b/cmd/commands/init.go index f7fae72e6c..acd967dcda 100644 --- a/cmd/commands/init.go +++ b/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 diff --git a/cmd/commands/log.go b/cmd/commands/log.go index 720e168b57..3300562c80 100644 --- a/cmd/commands/log.go +++ b/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") diff --git a/cmd/commands/query.go b/cmd/commands/query.go index 7d79c2f1f2..fa96756a42 100644 --- a/cmd/commands/query.go +++ b/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" ) diff --git a/cmd/commands/start.go b/cmd/commands/start.go index 4578738ceb..340ee46c90 100644 --- a/cmd/commands/start.go +++ b/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" diff --git a/cmd/commands/tx.go b/cmd/commands/tx.go index 73f81c6b18..d8edcd08e6 100644 --- a/cmd/commands/tx.go +++ b/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" ) diff --git a/cmd/commands/utils.go b/cmd/commands/utils.go index 0f263d82a8..e31847a899 100644 --- a/cmd/commands/utils.go +++ b/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" diff --git a/plugins/ibc/ibc.go b/plugins/ibc/ibc.go index 25f5a6da86..9f2bac6243 100644 --- a/plugins/ibc/ibc.go +++ b/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" ) diff --git a/plugins/ibc/ibc_test.go b/plugins/ibc/ibc_test.go index 16ea283b4e..58c7086482 100644 --- a/plugins/ibc/ibc_test.go +++ b/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" diff --git a/scripts/print_txs.go b/scripts/print_txs.go index 689173a907..bf8ddce362 100644 --- a/scripts/print_txs.go +++ b/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 ) diff --git a/state/execution.go b/state/execution.go index f642b80521..c950a628e6 100644 --- a/state/execution.go +++ b/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. diff --git a/state/log.go b/state/log.go index 5b102b5703..0a23513248 100644 --- a/state/log.go +++ b/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") diff --git a/state/state.go b/state/state.go index 68a7c36243..5555dae913 100644 --- a/state/state.go +++ b/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" ) diff --git a/tests/tendermint/main.go b/tests/tendermint/main.go index fa58b8f009..137cd6c215 100644 --- a/tests/tendermint/main.go +++ b/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 ) diff --git a/tests/tmsp/tmsp_test.go b/tests/tmsp/tmsp_test.go index 606b48e923..0efb9143e3 100644 --- a/tests/tmsp/tmsp_test.go +++ b/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" ) diff --git a/types/kvstore.go b/types/kvstore.go index 15088bdfb3..a795d7dd1f 100644 --- a/types/kvstore.go +++ b/types/kvstore.go @@ -4,7 +4,7 @@ import ( "container/list" "fmt" - . "github.com/tendermint/go-common" + . "github.com/tendermint/tmlibs/common" ) type KVStore interface { diff --git a/types/test_helpers.go b/types/test_helpers.go index 381ebda119..ccd46074ac 100644 --- a/types/test_helpers.go +++ b/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" ) diff --git a/types/tx.go b/types/tx.go index 3b45a03646..7b1b547a0b 100644 --- a/types/tx.go +++ b/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). diff --git a/types/tx_test.go b/types/tx_test.go index 72bc81ae4d..092652d1b8 100644 --- a/types/tx_test.go +++ b/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"