From f78f30c67a662f92bde872acf2a13350257d195f Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Mon, 2 Jul 2018 16:34:06 -0400 Subject: [PATCH] update for tm v0.22.0. tmlibs->tendermint/libs --- Gopkg.lock | 36 ++++++++++++------- Gopkg.toml | 2 +- baseapp/baseapp.go | 6 ++-- baseapp/baseapp_test.go | 6 ++-- baseapp/helpers.go | 2 +- client/context/helpers.go | 4 +-- client/keys.go | 2 +- client/keys/add.go | 2 +- client/keys/utils.go | 4 +-- client/lcd/lcd_test.go | 2 +- client/lcd/root.go | 4 +-- client/lcd/test_helpers.go | 6 ++-- client/tx/query.go | 2 +- cmd/gaia/app/app.go | 6 ++-- cmd/gaia/cmd/gaiacli/main.go | 2 +- cmd/gaia/cmd/gaiad/main.go | 6 ++-- cmd/gaia/cmd/gaiadebug/hack.go | 6 ++-- crypto/keys/keybase.go | 2 +- crypto/keys/keybase_test.go | 2 +- crypto/keys/mintkey.go | 2 +- docs/core/examples/app1.go | 6 ++-- docs/core/examples/app2.go | 6 ++-- docs/core/examples/app3.go | 6 ++-- docs/core/examples/app4.go | 6 ++-- examples/basecoin/app/app.go | 6 ++-- examples/basecoin/app/app_test.go | 4 +-- examples/basecoin/cmd/basecli/main.go | 2 +- examples/basecoin/cmd/basecoind/main.go | 6 ++-- examples/democoin/app/app.go | 6 ++-- examples/democoin/app/app_test.go | 4 +-- examples/democoin/cmd/democli/main.go | 2 +- examples/democoin/cmd/democoind/main.go | 6 ++-- .../democoin/x/assoc/validator_set_test.go | 2 +- examples/democoin/x/cool/keeper_test.go | 2 +- examples/democoin/x/oracle/oracle_test.go | 2 +- examples/democoin/x/pow/handler_test.go | 2 +- examples/democoin/x/pow/keeper_test.go | 4 +-- .../democoin/x/simplestake/keeper_test.go | 4 +-- examples/kvstore/main.go | 8 ++--- server/constructors.go | 4 +-- server/init.go | 6 ++-- server/init_test.go | 2 +- server/mock/app.go | 4 +-- server/mock/helpers.go | 2 +- server/mock/store.go | 2 +- server/mock/store_test.go | 2 +- server/start.go | 2 +- server/start_test.go | 2 +- server/test_helpers.go | 2 +- server/testnet.go | 2 +- server/util.go | 6 ++-- store/cachekvstore.go | 2 +- store/cachekvstore_test.go | 4 +-- store/dbstoreadapter.go | 2 +- store/firstlast.go | 2 +- store/gaskvstore_test.go | 2 +- store/iavlstore.go | 4 +-- store/iavlstore_test.go | 4 +-- store/memiterator.go | 4 +-- store/prefixstore_test.go | 2 +- store/rootmultistore.go | 4 +-- store/rootmultistore_test.go | 4 +-- tests/gobash.go | 2 +- types/account.go | 4 +-- types/context.go | 2 +- types/context_test.go | 4 +-- types/errors.go | 2 +- types/lib/linear_test.go | 4 +-- types/store.go | 4 +-- types/tags.go | 2 +- x/auth/ante_test.go | 2 +- x/auth/context_test.go | 2 +- x/auth/feekeeper_test.go | 2 +- x/auth/mapper_test.go | 4 +-- x/auth/mock/app.go | 4 +-- x/bank/keeper_test.go | 4 +-- x/ibc/client/cli/relay.go | 2 +- x/ibc/ibc_test.go | 4 +-- x/slashing/client/cli/query.go | 2 +- x/slashing/test_common.go | 4 +-- x/stake/client/cli/query.go | 2 +- x/stake/keeper/test_common.go | 4 +-- 82 files changed, 165 insertions(+), 153 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 92fe403aea..965fc745d9 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -267,8 +267,8 @@ [[projects]] name = "github.com/spf13/cobra" packages = ["."] - revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" - version = "v0.0.3" + revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b" + version = "v0.0.1" [[projects]] branch = "master" @@ -285,8 +285,8 @@ [[projects]] name = "github.com/spf13/viper" packages = ["."] - revision = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736" - version = "v1.0.2" + revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" + version = "v1.0.0" [[projects]] name = "github.com/stretchr/testify" @@ -355,9 +355,18 @@ "consensus", "consensus/types", "crypto", + "crypto/merkle", "crypto/tmhash", "evidence", + "libs/autofile", + "libs/cli", + "libs/cli/flags", + "libs/clist", + "libs/common", + "libs/db", "libs/events", + "libs/flowrate", + "libs/log", "libs/pubsub", "libs/pubsub/query", "lite", @@ -388,20 +397,17 @@ "types", "version" ] - revision = "af703620d4423478968ab602716a2a51cbb02ac6" - version = "v0.22.0-rc1" + revision = "5923b6288fe8ce9581936ee97c2bf9cf9c02c2f4" + version = "v0.22.0-rc2" [[projects]] name = "github.com/tendermint/tmlibs" packages = [ - "autofile", "bech32", "cli", "cli/flags", - "clist", "common", "db", - "flowrate", "log", "merkle", "merkle/tmhash" @@ -484,9 +490,13 @@ packages = [ ".", "balancer", + "balancer/base", + "balancer/roundrobin", "codes", "connectivity", "credentials", + "encoding", + "encoding/proto", "grpclb/grpc_lb_v1/messages", "grpclog", "internal", @@ -495,13 +505,15 @@ "naming", "peer", "resolver", + "resolver/dns", + "resolver/passthrough", "stats", "status", "tap", "transport" ] - revision = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e" - version = "v1.7.5" + revision = "d11072e7ca9811b1100b80ca0269ac831f06d024" + version = "v1.11.3" [[projects]] name = "gopkg.in/yaml.v2" @@ -512,6 +524,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "e625f9f13e5ca81fb8ecf6e794e0d1df87d8597a84af2abf70c057e20aa9b852" + inputs-digest = "e0adc07b8fcd9a48957baaa58a97b3bf1c72af18d06c7943b719794746ded31e" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index a9bae1d06f..910a3d56c2 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -62,7 +62,7 @@ [[constraint]] name = "github.com/tendermint/tendermint" - version = "=0.22.0-rc1" + version = "=0.22.0-rc2" [[constraint]] name = "github.com/tendermint/tmlibs" diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 1b4e701196..afc060cc35 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" abci "github.com/tendermint/tendermint/abci/types" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index 0d0b226265..b6032e035b 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -12,9 +12,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" tmtypes "github.com/tendermint/tendermint/types" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/wire" diff --git a/baseapp/helpers.go b/baseapp/helpers.go index 65c18315fd..2d7419a98c 100644 --- a/baseapp/helpers.go +++ b/baseapp/helpers.go @@ -3,7 +3,7 @@ package baseapp import ( "github.com/tendermint/tendermint/abci/server" abci "github.com/tendermint/tendermint/abci/types" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" ) // RunForever - BasecoinApp execution and cleanup diff --git a/client/context/helpers.go b/client/context/helpers.go index 8dd813f824..54c1463ee6 100644 --- a/client/context/helpers.go +++ b/client/context/helpers.go @@ -3,7 +3,7 @@ package context import ( "fmt" - "github.com/tendermint/tmlibs/common" + "github.com/tendermint/tendermint/libs/common" "github.com/pkg/errors" @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth" rpcclient "github.com/tendermint/tendermint/rpc/client" ctypes "github.com/tendermint/tendermint/rpc/core/types" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/keys" diff --git a/client/keys.go b/client/keys.go index 8c11561c5f..a39b074b98 100644 --- a/client/keys.go +++ b/client/keys.go @@ -2,7 +2,7 @@ package client import ( "github.com/cosmos/cosmos-sdk/crypto/keys" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" ) // GetKeyBase initializes a keybase based on the given db. diff --git a/client/keys/add.go b/client/keys/add.go index a39a374c82..12ad97ee8a 100644 --- a/client/keys/add.go +++ b/client/keys/add.go @@ -15,7 +15,7 @@ import ( ccrypto "github.com/cosmos/cosmos-sdk/crypto" "github.com/cosmos/cosmos-sdk/crypto/keys" - "github.com/tendermint/tmlibs/cli" + "github.com/tendermint/tendermint/libs/cli" ) const ( diff --git a/client/keys/utils.go b/client/keys/utils.go index c0d7f876fa..aaa7c37f83 100644 --- a/client/keys/utils.go +++ b/client/keys/utils.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/viper" keys "github.com/cosmos/cosmos-sdk/crypto/keys" - "github.com/tendermint/tmlibs/cli" - dbm "github.com/tendermint/tmlibs/db" + "github.com/tendermint/tendermint/libs/cli" + dbm "github.com/tendermint/tendermint/libs/db" "github.com/cosmos/cosmos-sdk/client" diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go index 1b1a02fefb..229e8d7137 100644 --- a/client/lcd/lcd_test.go +++ b/client/lcd/lcd_test.go @@ -15,7 +15,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" p2p "github.com/tendermint/tendermint/p2p" ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/tendermint/tmlibs/common" + "github.com/tendermint/tendermint/libs/common" client "github.com/cosmos/cosmos-sdk/client" keys "github.com/cosmos/cosmos-sdk/client/keys" diff --git a/client/lcd/root.go b/client/lcd/root.go index 472c914060..e79ffd2f13 100644 --- a/client/lcd/root.go +++ b/client/lcd/root.go @@ -7,10 +7,10 @@ import ( "github.com/gorilla/mux" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" tmserver "github.com/tendermint/tendermint/rpc/lib/server" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" client "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/context" diff --git a/client/lcd/test_helpers.go b/client/lcd/test_helpers.go index dbdf9b724d..0467262396 100644 --- a/client/lcd/test_helpers.go +++ b/client/lcd/test_helpers.go @@ -24,9 +24,9 @@ import ( "github.com/tendermint/tendermint/proxy" tmrpc "github.com/tendermint/tendermint/rpc/lib/server" tmtypes "github.com/tendermint/tendermint/types" - "github.com/tendermint/tmlibs/cli" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/cli" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/client" keys "github.com/cosmos/cosmos-sdk/client/keys" diff --git a/client/tx/query.go b/client/tx/query.go index e70ecea399..dfe626c38c 100644 --- a/client/tx/query.go +++ b/client/tx/query.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/tendermint/tmlibs/common" + "github.com/tendermint/tendermint/libs/common" "github.com/gorilla/mux" "github.com/spf13/cobra" diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go index 399c816830..77b179765e 100644 --- a/cmd/gaia/app/app.go +++ b/cmd/gaia/app/app.go @@ -6,9 +6,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bam "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/cmd/gaia/cmd/gaiacli/main.go b/cmd/gaia/cmd/gaiacli/main.go index 37e3f1664f..4ab5d02b98 100644 --- a/cmd/gaia/cmd/gaiacli/main.go +++ b/cmd/gaia/cmd/gaiacli/main.go @@ -3,7 +3,7 @@ package main import ( "github.com/spf13/cobra" - "github.com/tendermint/tmlibs/cli" + "github.com/tendermint/tendermint/libs/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/keys" diff --git a/cmd/gaia/cmd/gaiad/main.go b/cmd/gaia/cmd/gaiad/main.go index 1915ef7517..d96275de65 100644 --- a/cmd/gaia/cmd/gaiad/main.go +++ b/cmd/gaia/cmd/gaiad/main.go @@ -7,9 +7,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" - "github.com/tendermint/tmlibs/cli" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/cli" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/cmd/gaia/app" "github.com/cosmos/cosmos-sdk/server" diff --git a/cmd/gaia/cmd/gaiadebug/hack.go b/cmd/gaia/cmd/gaiadebug/hack.go index 74b42adb38..1f2ef0649d 100644 --- a/cmd/gaia/cmd/gaiadebug/hack.go +++ b/cmd/gaia/cmd/gaiadebug/hack.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bam "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/crypto/keys/keybase.go b/crypto/keys/keybase.go index 396bb57821..82adc53dda 100644 --- a/crypto/keys/keybase.go +++ b/crypto/keys/keybase.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" tcrypto "github.com/tendermint/tendermint/crypto" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" "github.com/cosmos/cosmos-sdk/crypto" "github.com/cosmos/cosmos-sdk/crypto/keys/bip39" diff --git a/crypto/keys/keybase_test.go b/crypto/keys/keybase_test.go index ac0f7fa4da..c910849865 100644 --- a/crypto/keys/keybase_test.go +++ b/crypto/keys/keybase_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" ) // TestKeyManagement makes sure we can manipulate these keys well diff --git a/crypto/keys/mintkey.go b/crypto/keys/mintkey.go index 8b0a1870bb..cfba18e092 100644 --- a/crypto/keys/mintkey.go +++ b/crypto/keys/mintkey.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "fmt" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" "github.com/cosmos/cosmos-sdk/crypto/keys/bcrypt" "github.com/tendermint/tendermint/crypto" diff --git a/docs/core/examples/app1.go b/docs/core/examples/app1.go index 9daf8d3334..f9eceecdb5 100644 --- a/docs/core/examples/app1.go +++ b/docs/core/examples/app1.go @@ -3,9 +3,9 @@ package app import ( "encoding/json" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bapp "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/docs/core/examples/app2.go b/docs/core/examples/app2.go index d7490765e5..b4d44dca7b 100644 --- a/docs/core/examples/app2.go +++ b/docs/core/examples/app2.go @@ -6,9 +6,9 @@ import ( "fmt" "github.com/tendermint/tendermint/crypto" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bapp "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/docs/core/examples/app3.go b/docs/core/examples/app3.go index d871a1cfd3..f99e34b8b2 100644 --- a/docs/core/examples/app3.go +++ b/docs/core/examples/app3.go @@ -1,9 +1,9 @@ package app import ( - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bapp "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/docs/core/examples/app4.go b/docs/core/examples/app4.go index 007d2842bc..22282738f6 100644 --- a/docs/core/examples/app4.go +++ b/docs/core/examples/app4.go @@ -2,9 +2,9 @@ package app import ( abci "github.com/tendermint/tendermint/abci/types" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bapp "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go index 089d1ca23c..a182b83dd7 100644 --- a/examples/basecoin/app/app.go +++ b/examples/basecoin/app/app.go @@ -5,9 +5,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bam "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/examples/basecoin/app/app_test.go b/examples/basecoin/app/app_test.go index 499c0e4082..0b5d37dc4f 100644 --- a/examples/basecoin/app/app_test.go +++ b/examples/basecoin/app/app_test.go @@ -16,8 +16,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" ) func setGenesis(bapp *BasecoinApp, accs ...auth.BaseAccount) error { diff --git a/examples/basecoin/cmd/basecli/main.go b/examples/basecoin/cmd/basecli/main.go index 1191aab6ab..d99a9178d4 100644 --- a/examples/basecoin/cmd/basecli/main.go +++ b/examples/basecoin/cmd/basecli/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/tendermint/tmlibs/cli" + "github.com/tendermint/tendermint/libs/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/keys" diff --git a/examples/basecoin/cmd/basecoind/main.go b/examples/basecoin/cmd/basecoind/main.go index f3f3de519a..9d026922cc 100644 --- a/examples/basecoin/cmd/basecoind/main.go +++ b/examples/basecoin/cmd/basecoind/main.go @@ -8,9 +8,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" - "github.com/tendermint/tmlibs/cli" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/cli" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/examples/basecoin/app" "github.com/cosmos/cosmos-sdk/server" diff --git a/examples/democoin/app/app.go b/examples/democoin/app/app.go index 195af0c9ea..100e25435d 100644 --- a/examples/democoin/app/app.go +++ b/examples/democoin/app/app.go @@ -5,9 +5,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bam "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/examples/democoin/app/app_test.go b/examples/democoin/app/app_test.go index 36aca760f1..a642eff72d 100644 --- a/examples/democoin/app/app_test.go +++ b/examples/democoin/app/app_test.go @@ -14,8 +14,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" ) func setGenesis(bapp *DemocoinApp, trend string, accs ...auth.BaseAccount) error { diff --git a/examples/democoin/cmd/democli/main.go b/examples/democoin/cmd/democli/main.go index cbf43508ba..43f86504eb 100644 --- a/examples/democoin/cmd/democli/main.go +++ b/examples/democoin/cmd/democli/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/tendermint/tmlibs/cli" + "github.com/tendermint/tendermint/libs/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/keys" diff --git a/examples/democoin/cmd/democoind/main.go b/examples/democoin/cmd/democoind/main.go index 92f9618b04..1cc22b8877 100644 --- a/examples/democoin/cmd/democoind/main.go +++ b/examples/democoin/cmd/democoind/main.go @@ -8,9 +8,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" - "github.com/tendermint/tmlibs/cli" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/cli" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/examples/democoin/app" "github.com/cosmos/cosmos-sdk/server" diff --git a/examples/democoin/x/assoc/validator_set_test.go b/examples/democoin/x/assoc/validator_set_test.go index c20aeb8571..e5932c14b3 100644 --- a/examples/democoin/x/assoc/validator_set_test.go +++ b/examples/democoin/x/assoc/validator_set_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" "github.com/cosmos/cosmos-sdk/examples/democoin/mock" "github.com/cosmos/cosmos-sdk/store" diff --git a/examples/democoin/x/cool/keeper_test.go b/examples/democoin/x/cool/keeper_test.go index ee2e529f26..f0d65a545e 100644 --- a/examples/democoin/x/cool/keeper_test.go +++ b/examples/democoin/x/cool/keeper_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/examples/democoin/x/oracle/oracle_test.go b/examples/democoin/x/oracle/oracle_test.go index 228378c34a..ef925c94f4 100644 --- a/examples/democoin/x/oracle/oracle_test.go +++ b/examples/democoin/x/oracle/oracle_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" "github.com/cosmos/cosmos-sdk/examples/democoin/mock" "github.com/cosmos/cosmos-sdk/store" diff --git a/examples/democoin/x/pow/handler_test.go b/examples/democoin/x/pow/handler_test.go index 77a22057bc..283c30ef59 100644 --- a/examples/democoin/x/pow/handler_test.go +++ b/examples/democoin/x/pow/handler_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" wire "github.com/cosmos/cosmos-sdk/wire" diff --git a/examples/democoin/x/pow/keeper_test.go b/examples/democoin/x/pow/keeper_test.go index 31ad2fc121..7a9b869849 100644 --- a/examples/democoin/x/pow/keeper_test.go +++ b/examples/democoin/x/pow/keeper_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/examples/democoin/x/simplestake/keeper_test.go b/examples/democoin/x/simplestake/keeper_test.go index be8e335e2b..4496eb369c 100644 --- a/examples/democoin/x/simplestake/keeper_test.go +++ b/examples/democoin/x/simplestake/keeper_test.go @@ -9,8 +9,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/examples/kvstore/main.go b/examples/kvstore/main.go index c2c56eba5f..47416da057 100644 --- a/examples/kvstore/main.go +++ b/examples/kvstore/main.go @@ -8,10 +8,10 @@ import ( "github.com/spf13/viper" "github.com/tendermint/tendermint/abci/server" - "github.com/tendermint/tmlibs/cli" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/cli" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bam "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/server/constructors.go b/server/constructors.go index 79e1558c4b..d93a1defec 100644 --- a/server/constructors.go +++ b/server/constructors.go @@ -6,8 +6,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" ) // AppCreator lets us lazily initialize app, using home dir diff --git a/server/init.go b/server/init.go index ed1727e35e..31d3001e90 100644 --- a/server/init.go +++ b/server/init.go @@ -21,9 +21,9 @@ import ( "github.com/tendermint/tendermint/p2p" pvm "github.com/tendermint/tendermint/privval" tmtypes "github.com/tendermint/tendermint/types" - tmcli "github.com/tendermint/tmlibs/cli" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" + tmcli "github.com/tendermint/tendermint/libs/cli" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" clkeys "github.com/cosmos/cosmos-sdk/client/keys" serverconfig "github.com/cosmos/cosmos-sdk/server/config" diff --git a/server/init_test.go b/server/init_test.go index f05bcb54a1..fb448bf5fa 100644 --- a/server/init_test.go +++ b/server/init_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/server/mock" "github.com/cosmos/cosmos-sdk/wire" diff --git a/server/mock/app.go b/server/mock/app.go index b2d19e2e9e..c99150b979 100644 --- a/server/mock/app.go +++ b/server/mock/app.go @@ -8,8 +8,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bam "github.com/cosmos/cosmos-sdk/baseapp" gc "github.com/cosmos/cosmos-sdk/server/config" diff --git a/server/mock/helpers.go b/server/mock/helpers.go index 4510f4e905..88aacb4d8e 100644 --- a/server/mock/helpers.go +++ b/server/mock/helpers.go @@ -6,7 +6,7 @@ import ( "os" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" ) // SetupApp returns an application as well as a clean-up function diff --git a/server/mock/store.go b/server/mock/store.go index 9dca581596..d62b9ad23e 100644 --- a/server/mock/store.go +++ b/server/mock/store.go @@ -1,7 +1,7 @@ package mock import ( - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/server/mock/store_test.go b/server/mock/store_test.go index bf6a1007b6..0ea5ffd2c7 100644 --- a/server/mock/store_test.go +++ b/server/mock/store_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/server/start.go b/server/start.go index c848c9e6ee..4f90930262 100644 --- a/server/start.go +++ b/server/start.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/tendermint/node" pvm "github.com/tendermint/tendermint/privval" "github.com/tendermint/tendermint/proxy" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" ) const ( diff --git a/server/start_test.go b/server/start_test.go index 3817e1ee89..570071e7bf 100644 --- a/server/start_test.go +++ b/server/start_test.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/wire" "github.com/tendermint/tendermint/abci/server" tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" ) func TestStartStandAlone(t *testing.T) { diff --git a/server/test_helpers.go b/server/test_helpers.go index 8de4672e33..d1230898dd 100644 --- a/server/test_helpers.go +++ b/server/test_helpers.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/tendermint/tmlibs/cli" + "github.com/tendermint/tendermint/libs/cli" ) // Get a free address for a test tendermint server diff --git a/server/testnet.go b/server/testnet.go index a60701d246..d102b87ccb 100644 --- a/server/testnet.go +++ b/server/testnet.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/wire" "github.com/spf13/viper" cfg "github.com/tendermint/tendermint/config" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" ) var ( diff --git a/server/util.go b/server/util.go index bd9d48d752..d1ad001c52 100644 --- a/server/util.go +++ b/server/util.go @@ -15,9 +15,9 @@ import ( "github.com/cosmos/cosmos-sdk/wire" tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tmlibs/cli" - tmflags "github.com/tendermint/tmlibs/cli/flags" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/cli" + tmflags "github.com/tendermint/tendermint/libs/cli/flags" + "github.com/tendermint/tendermint/libs/log" ) // server context diff --git a/store/cachekvstore.go b/store/cachekvstore.go index aeed6ee5fe..1263cef5f3 100644 --- a/store/cachekvstore.go +++ b/store/cachekvstore.go @@ -5,7 +5,7 @@ import ( "sort" "sync" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" ) // If value is nil but deleted is false, it means the parent doesn't have the diff --git a/store/cachekvstore_test.go b/store/cachekvstore_test.go index f9be76dae3..e7958dfcdf 100644 --- a/store/cachekvstore_test.go +++ b/store/cachekvstore_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" ) func newCacheKVStore() CacheKVStore { diff --git a/store/dbstoreadapter.go b/store/dbstoreadapter.go index 59369af563..09d48cf9d9 100644 --- a/store/dbstoreadapter.go +++ b/store/dbstoreadapter.go @@ -2,7 +2,7 @@ package store import ( sdk "github.com/cosmos/cosmos-sdk/types" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" ) type dbStoreAdapter struct { diff --git a/store/firstlast.go b/store/firstlast.go index e6cb084323..70f6659a87 100644 --- a/store/firstlast.go +++ b/store/firstlast.go @@ -3,7 +3,7 @@ package store import ( "bytes" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" ) // Gets the first item. diff --git a/store/gaskvstore_test.go b/store/gaskvstore_test.go index 524dc53237..fe84affa28 100644 --- a/store/gaskvstore_test.go +++ b/store/gaskvstore_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" ) func newGasKVStore() KVStore { diff --git a/store/iavlstore.go b/store/iavlstore.go index 5758802c6e..2911598033 100644 --- a/store/iavlstore.go +++ b/store/iavlstore.go @@ -7,8 +7,8 @@ import ( "github.com/tendermint/go-amino" "github.com/tendermint/iavl" abci "github.com/tendermint/tendermint/abci/types" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/store/iavlstore_test.go b/store/iavlstore_test.go index b23f04e5cd..50d690d908 100644 --- a/store/iavlstore_test.go +++ b/store/iavlstore_test.go @@ -7,8 +7,8 @@ import ( "github.com/tendermint/iavl" abci "github.com/tendermint/tendermint/abci/types" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/store/memiterator.go b/store/memiterator.go index a05f3443ed..a72418db63 100644 --- a/store/memiterator.go +++ b/store/memiterator.go @@ -3,8 +3,8 @@ package store import ( "bytes" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" ) // Iterates over iterKVCache items. diff --git a/store/prefixstore_test.go b/store/prefixstore_test.go index 76fb7f481f..f57ab20e40 100644 --- a/store/prefixstore_test.go +++ b/store/prefixstore_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/iavl" - dbm "github.com/tendermint/tmlibs/db" + dbm "github.com/tendermint/tendermint/libs/db" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/store/rootmultistore.go b/store/rootmultistore.go index 11e089182f..28d9e7e68a 100644 --- a/store/rootmultistore.go +++ b/store/rootmultistore.go @@ -7,8 +7,8 @@ import ( "golang.org/x/crypto/ripemd160" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/merkle" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/crypto/merkle" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/store/rootmultistore_test.go b/store/rootmultistore_test.go index 197726f4ac..137f04eabb 100644 --- a/store/rootmultistore_test.go +++ b/store/rootmultistore_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/merkle" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/crypto/merkle" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/tests/gobash.go b/tests/gobash.go index f46bad3c1c..b2d765281a 100644 --- a/tests/gobash.go +++ b/tests/gobash.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" ) // Execute the command, return stdout, logging stdout/err to t. diff --git a/types/account.go b/types/account.go index bd7cbb29cd..ce872d8b54 100644 --- a/types/account.go +++ b/types/account.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tmlibs/bech32" - cmn "github.com/tendermint/tmlibs/common" + "github.com/tendermint/tendermint/libs/bech32" + cmn "github.com/tendermint/tendermint/libs/common" ) //Address is a go crypto-style Address diff --git a/types/context.go b/types/context.go index 276a664803..e55eff1ab0 100644 --- a/types/context.go +++ b/types/context.go @@ -7,7 +7,7 @@ import ( "github.com/golang/protobuf/proto" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" ) /* diff --git a/types/context_test.go b/types/context_test.go index cad2076640..fb2786cffa 100644 --- a/types/context_test.go +++ b/types/context_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/store" "github.com/cosmos/cosmos-sdk/types" diff --git a/types/errors.go b/types/errors.go index 392a954d16..6969549d90 100644 --- a/types/errors.go +++ b/types/errors.go @@ -3,7 +3,7 @@ package types import ( "fmt" - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/types/lib/linear_test.go b/types/lib/linear_test.go index 8b5a63fd41..b14300a987 100644 --- a/types/lib/linear_test.go +++ b/types/lib/linear_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" abci "github.com/tendermint/tendermint/abci/types" diff --git a/types/store.go b/types/store.go index 5aecd7d093..04de2c7c1a 100644 --- a/types/store.go +++ b/types/store.go @@ -4,8 +4,8 @@ import ( "fmt" abci "github.com/tendermint/tendermint/abci/types" - cmn "github.com/tendermint/tmlibs/common" - dbm "github.com/tendermint/tmlibs/db" + cmn "github.com/tendermint/tendermint/libs/common" + dbm "github.com/tendermint/tendermint/libs/db" ) // NOTE: These are implemented in cosmos-sdk/store. diff --git a/types/tags.go b/types/tags.go index 6bd721a5fc..add0c0ad54 100644 --- a/types/tags.go +++ b/types/tags.go @@ -1,7 +1,7 @@ package types import ( - cmn "github.com/tendermint/tmlibs/common" + cmn "github.com/tendermint/tendermint/libs/common" ) // Type synonym for convenience diff --git a/x/auth/ante_test.go b/x/auth/ante_test.go index 1808afc99c..aebf66f9a2 100644 --- a/x/auth/ante_test.go +++ b/x/auth/ante_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" wire "github.com/cosmos/cosmos-sdk/wire" diff --git a/x/auth/context_test.go b/x/auth/context_test.go index 5f432be357..b58547328d 100644 --- a/x/auth/context_test.go +++ b/x/auth/context_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/auth/feekeeper_test.go b/x/auth/feekeeper_test.go index e935bb4c49..a53839a8b4 100644 --- a/x/auth/feekeeper_test.go +++ b/x/auth/feekeeper_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" sdk "github.com/cosmos/cosmos-sdk/types" wire "github.com/cosmos/cosmos-sdk/wire" diff --git a/x/auth/mapper_test.go b/x/auth/mapper_test.go index 4b270f0225..6b242e683b 100644 --- a/x/auth/mapper_test.go +++ b/x/auth/mapper_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/auth/mock/app.go b/x/auth/mock/app.go index 9c672b5a78..758b1efab8 100644 --- a/x/auth/mock/app.go +++ b/x/auth/mock/app.go @@ -5,8 +5,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" bam "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/bank/keeper_test.go b/x/bank/keeper_test.go index b35298be9d..c545b774f0 100644 --- a/x/bank/keeper_test.go +++ b/x/bank/keeper_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/ibc/client/cli/relay.go b/x/ibc/client/cli/relay.go index 2dc3129c6e..d434ff35a4 100644 --- a/x/ibc/client/cli/relay.go +++ b/x/ibc/client/cli/relay.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/tmlibs/log" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/ibc/ibc_test.go b/x/ibc/ibc_test.go index 33535145d8..4cb708c1bb 100644 --- a/x/ibc/ibc_test.go +++ b/x/ibc/ibc_test.go @@ -7,8 +7,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/slashing/client/cli/query.go b/x/slashing/client/cli/query.go index c1b16eb3a3..3e2023f5eb 100644 --- a/x/slashing/client/cli/query.go +++ b/x/slashing/client/cli/query.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/tmlibs/cli" + "github.com/tendermint/tendermint/libs/cli" "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/slashing/test_common.go b/x/slashing/test_common.go index 2d192c54df..edf119bc7f 100644 --- a/x/slashing/test_common.go +++ b/x/slashing/test_common.go @@ -9,8 +9,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/stake/client/cli/query.go b/x/stake/client/cli/query.go index c162717efd..bccfd7c2be 100644 --- a/x/stake/client/cli/query.go +++ b/x/stake/client/cli/query.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/tendermint/tmlibs/cli" + "github.com/tendermint/tendermint/libs/cli" "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/stake/keeper/test_common.go b/x/stake/keeper/test_common.go index 17b21c6346..aa3c25aba9 100644 --- a/x/stake/keeper/test_common.go +++ b/x/stake/keeper/test_common.go @@ -10,8 +10,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto" - dbm "github.com/tendermint/tmlibs/db" - "github.com/tendermint/tmlibs/log" + dbm "github.com/tendermint/tendermint/libs/db" + "github.com/tendermint/tendermint/libs/log" "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types"