From 60f166e823d9ee4f93f81e7530c929233a8d0d5f Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Mon, 30 Mar 2015 22:50:27 -0700 Subject: [PATCH] tendermint2 --- account/account.go | 2 +- account/priv_account.go | 2 +- account/privkey.go | 4 ++-- account/pubkey.go | 4 ++-- account/signature.go | 4 ++-- account/signature_test.go | 4 ++-- alert/alert.go | 2 +- alert/email.go | 2 +- alert/log.go | 2 +- binary/log.go | 2 +- binary/reflect.go | 2 +- blockchain/log.go | 2 +- blockchain/pool.go | 4 ++-- blockchain/pool_test.go | 4 ++-- blockchain/reactor.go | 10 +++++----- blockchain/store.go | 8 ++++---- cmd/gen_account.go | 4 ++-- cmd/gen_tx.go | 12 ++++++------ cmd/gen_validator.go | 6 +++--- cmd/log.go | 2 +- cmd/main.go | 4 ++-- cmd/probe_upnp.go | 2 +- config/log.go | 2 +- consensus/log.go | 2 +- consensus/pol.go | 10 +++++----- consensus/pol_test.go | 8 ++++---- consensus/reactor.go | 14 +++++++------- consensus/state.go | 18 +++++++++--------- consensus/state_test.go | 2 +- consensus/test.go | 8 ++++---- consensus/types/proposal.go | 6 +++--- consensus/vote_set.go | 10 +++++----- consensus/vote_set_test.go | 8 ++++---- daemon/daemon.go | 20 ++++++++++---------- daemon/log.go | 2 +- db/db.go | 4 ++-- logger/log.go | 4 ++-- mempool/log.go | 2 +- mempool/mempool.go | 6 +++--- mempool/reactor.go | 6 +++--- merkle/iavl_node.go | 2 +- merkle/iavl_test.go | 6 +++--- merkle/iavl_tree.go | 6 +++--- merkle/simple_tree.go | 2 +- merkle/simple_tree_test.go | 2 +- p2p/addrbook.go | 2 +- p2p/connection.go | 4 ++-- p2p/listener.go | 4 ++-- p2p/log.go | 2 +- p2p/peer.go | 4 ++-- p2p/peer_set_test.go | 2 +- p2p/pex_reactor.go | 4 ++-- p2p/switch.go | 2 +- p2p/switch_test.go | 4 ++-- p2p/upnp/log.go | 2 +- p2p/upnp/probe.go | 2 +- rpc/core/accounts.go | 2 +- rpc/core/blocks.go | 4 ++-- rpc/core/mempool.go | 6 +++--- rpc/core/net.go | 8 ++++---- rpc/core/pipe.go | 8 ++++---- rpc/core/responses.go | 6 +++--- rpc/core/txs.go | 4 ++-- rpc/core/validators.go | 2 +- rpc/handlers.go | 4 ++-- rpc/http_params.go | 2 +- rpc/http_server.go | 8 ++++---- rpc/test/http_rpc_test.go | 10 +++++----- rpc/test/json_rpc_test.go | 12 ++++++------ rpc/test/test.go | 18 +++++++++--------- state/block_cache.go | 10 +++++----- state/common.go | 6 +++--- state/execution.go | 8 ++++---- state/genesis.go | 12 ++++++------ state/log.go | 2 +- state/priv_validator.go | 12 ++++++------ state/state.go | 10 +++++----- state/state_test.go | 6 +++--- state/test.go | 8 ++++---- state/tx_cache.go | 8 ++++---- state/validator.go | 6 +++--- state/validator_set.go | 8 ++++---- state/validator_set_test.go | 4 ++-- types/block.go | 10 +++++----- types/log.go | 2 +- types/part_set.go | 4 ++-- types/part_set_test.go | 2 +- types/tx.go | 6 +++--- types/vote.go | 6 +++--- vm/log.go | 2 +- vm/native.go | 6 +++--- vm/stack.go | 2 +- vm/test/fake_app_state.go | 6 +++--- vm/test/vm_test.go | 4 ++-- vm/types.go | 2 +- vm/vm.go | 4 ++-- 96 files changed, 260 insertions(+), 260 deletions(-) diff --git a/account/account.go b/account/account.go index 520afd70c..4a219d1fd 100644 --- a/account/account.go +++ b/account/account.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint2/binary" ) // Signable is an interface for all signable things. diff --git a/account/priv_account.go b/account/priv_account.go index 23114893a..a3525648d 100644 --- a/account/priv_account.go +++ b/account/priv_account.go @@ -2,7 +2,7 @@ package account import ( "github.com/tendermint/ed25519" - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) type PrivAccount struct { diff --git a/account/privkey.go b/account/privkey.go index bf088b5ea..9cbb05b1c 100644 --- a/account/privkey.go +++ b/account/privkey.go @@ -2,8 +2,8 @@ package account import ( "github.com/tendermint/ed25519" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) // PrivKey is part of PrivAccount and state.PrivValidator. diff --git a/account/pubkey.go b/account/pubkey.go index fa8dce578..4d7064808 100644 --- a/account/pubkey.go +++ b/account/pubkey.go @@ -4,8 +4,8 @@ import ( "errors" "github.com/tendermint/ed25519" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) // PubKey is part of Account and Validator. diff --git a/account/signature.go b/account/signature.go index 53678f723..a029eb31c 100644 --- a/account/signature.go +++ b/account/signature.go @@ -3,8 +3,8 @@ package account import ( "fmt" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) // Signature is a part of Txs and consensus Votes. diff --git a/account/signature_test.go b/account/signature_test.go index 8168c5c6c..21afd84d2 100644 --- a/account/signature_test.go +++ b/account/signature_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/tendermint/ed25519" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) func TestSignAndValidate(t *testing.T) { diff --git a/alert/alert.go b/alert/alert.go index d761da2a9..b3cace539 100644 --- a/alert/alert.go +++ b/alert/alert.go @@ -5,7 +5,7 @@ import ( "time" "github.com/sfreiberg/gotwilio" - "github.com/tendermint/tendermint/config" + "github.com/tendermint/tendermint2/config" ) var lastAlertUnix int64 = 0 diff --git a/alert/email.go b/alert/email.go index d484f6f26..19f45c8c7 100644 --- a/alert/email.go +++ b/alert/email.go @@ -13,7 +13,7 @@ import ( "regexp" "strings" - "github.com/tendermint/tendermint/config" + "github.com/tendermint/tendermint2/config" ) // Convenience function diff --git a/alert/log.go b/alert/log.go index 0f0740e0c..32b400661 100644 --- a/alert/log.go +++ b/alert/log.go @@ -1,7 +1,7 @@ package alert import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "alert") diff --git a/binary/log.go b/binary/log.go index 28586125a..26bbbcea2 100644 --- a/binary/log.go +++ b/binary/log.go @@ -2,7 +2,7 @@ package binary import ( "github.com/tendermint/log15" - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "binary") diff --git a/binary/reflect.go b/binary/reflect.go index 3ea8f0f6b..736ff4ede 100644 --- a/binary/reflect.go +++ b/binary/reflect.go @@ -9,7 +9,7 @@ import ( "sync" "time" - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) type TypeInfo struct { diff --git a/blockchain/log.go b/blockchain/log.go index f04e99943..caf3dcbaf 100644 --- a/blockchain/log.go +++ b/blockchain/log.go @@ -1,7 +1,7 @@ package blockchain import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "blockchain") diff --git a/blockchain/pool.go b/blockchain/pool.go index 0bd620463..2b2344e38 100644 --- a/blockchain/pool.go +++ b/blockchain/pool.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "time" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/types" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/types" ) const ( diff --git a/blockchain/pool_test.go b/blockchain/pool_test.go index c07a11d85..235a275c7 100644 --- a/blockchain/pool_test.go +++ b/blockchain/pool_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/types" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/types" ) type testPeer struct { diff --git a/blockchain/reactor.go b/blockchain/reactor.go index 7e776ab07..444355e6f 100644 --- a/blockchain/reactor.go +++ b/blockchain/reactor.go @@ -7,11 +7,11 @@ import ( "sync/atomic" "time" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/p2p" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/p2p" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) const ( diff --git a/blockchain/store.go b/blockchain/store.go index f9d54cd23..7a514fbce 100644 --- a/blockchain/store.go +++ b/blockchain/store.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - dbm "github.com/tendermint/tendermint/db" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + dbm "github.com/tendermint/tendermint2/db" + "github.com/tendermint/tendermint2/types" ) /* diff --git a/cmd/gen_account.go b/cmd/gen_account.go index aea29cf9d..a19a4999e 100644 --- a/cmd/gen_account.go +++ b/cmd/gen_account.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" ) func gen_account() { diff --git a/cmd/gen_tx.go b/cmd/gen_tx.go index 687339bed..a2d43bfef 100644 --- a/cmd/gen_tx.go +++ b/cmd/gen_tx.go @@ -8,12 +8,12 @@ import ( "os" "strconv" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - dbm "github.com/tendermint/tendermint/db" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + dbm "github.com/tendermint/tendermint2/db" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) func getString(prompt string) string { diff --git a/cmd/gen_validator.go b/cmd/gen_validator.go index 1d3af701e..5058453c4 100644 --- a/cmd/gen_validator.go +++ b/cmd/gen_validator.go @@ -3,9 +3,9 @@ package main import ( "fmt" - "github.com/tendermint/tendermint/binary" - "github.com/tendermint/tendermint/config" - sm "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint2/config" + sm "github.com/tendermint/tendermint2/state" ) func gen_validator() { diff --git a/cmd/log.go b/cmd/log.go index c04723782..d01ae5f3f 100644 --- a/cmd/log.go +++ b/cmd/log.go @@ -1,7 +1,7 @@ package main import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "main") diff --git a/cmd/main.go b/cmd/main.go index 03b1a81a0..15244b4e8 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/daemon" + "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint2/daemon" ) func main() { diff --git a/cmd/probe_upnp.go b/cmd/probe_upnp.go index 927e25484..483623ce1 100644 --- a/cmd/probe_upnp.go +++ b/cmd/probe_upnp.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/tendermint/tendermint/p2p/upnp" + "github.com/tendermint/tendermint2/p2p/upnp" ) func probe_upnp() { diff --git a/config/log.go b/config/log.go index 3cd8f430f..4597e4a0e 100644 --- a/config/log.go +++ b/config/log.go @@ -1,7 +1,7 @@ package config import ( - // We can't use github.com/tendermint/tendermint/logger + // We can't use github.com/tendermint/tendermint2/logger // because that would create a dependency cycle. "github.com/tendermint/log15" ) diff --git a/consensus/log.go b/consensus/log.go index 0b3a33dba..ea3ff2725 100644 --- a/consensus/log.go +++ b/consensus/log.go @@ -1,7 +1,7 @@ package consensus import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "consensus") diff --git a/consensus/pol.go b/consensus/pol.go index 06784d588..1fb71ba26 100644 --- a/consensus/pol.go +++ b/consensus/pol.go @@ -3,11 +3,11 @@ package consensus import ( "fmt" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) // Each signature of a POL (proof-of-lock, see whitepaper) is diff --git a/consensus/pol_test.go b/consensus/pol_test.go index e1d67e4dd..7f3e65f1c 100644 --- a/consensus/pol_test.go +++ b/consensus/pol_test.go @@ -1,10 +1,10 @@ package consensus import ( - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" "bytes" "testing" diff --git a/consensus/reactor.go b/consensus/reactor.go index a3028b6d5..52ce48e81 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -8,13 +8,13 @@ import ( "sync/atomic" "time" - "github.com/tendermint/tendermint/binary" - bc "github.com/tendermint/tendermint/blockchain" - . "github.com/tendermint/tendermint/common" - . "github.com/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/p2p" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/binary" + bc "github.com/tendermint/tendermint2/blockchain" + . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint2/consensus/types" + "github.com/tendermint/tendermint2/p2p" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) const ( diff --git a/consensus/state.go b/consensus/state.go index 8756df612..82fed3354 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -60,15 +60,15 @@ import ( "sync/atomic" "time" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - bc "github.com/tendermint/tendermint/blockchain" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/config" - . "github.com/tendermint/tendermint/consensus/types" - mempl "github.com/tendermint/tendermint/mempool" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + bc "github.com/tendermint/tendermint2/blockchain" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/config" + . "github.com/tendermint/tendermint2/consensus/types" + mempl "github.com/tendermint/tendermint2/mempool" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) const ( diff --git a/consensus/state_test.go b/consensus/state_test.go index 60e54a692..ac4ba36f8 100644 --- a/consensus/state_test.go +++ b/consensus/state_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/types" ) func TestSetupRound(t *testing.T) { diff --git a/consensus/test.go b/consensus/test.go index 397befa0d..798b597f6 100644 --- a/consensus/test.go +++ b/consensus/test.go @@ -3,10 +3,10 @@ package consensus import ( "sort" - bc "github.com/tendermint/tendermint/blockchain" - dbm "github.com/tendermint/tendermint/db" - mempl "github.com/tendermint/tendermint/mempool" - sm "github.com/tendermint/tendermint/state" + bc "github.com/tendermint/tendermint2/blockchain" + dbm "github.com/tendermint/tendermint2/db" + mempl "github.com/tendermint/tendermint2/mempool" + sm "github.com/tendermint/tendermint2/state" ) func randConsensusState() (*ConsensusState, []*sm.PrivValidator) { diff --git a/consensus/types/proposal.go b/consensus/types/proposal.go index a78570a53..6e0235a30 100644 --- a/consensus/types/proposal.go +++ b/consensus/types/proposal.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint2/types" ) var ( diff --git a/consensus/vote_set.go b/consensus/vote_set.go index 973d4b7a1..f24485a4d 100644 --- a/consensus/vote_set.go +++ b/consensus/vote_set.go @@ -6,11 +6,11 @@ import ( "strings" "sync" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) // VoteSet helps collect signatures from validators at each height+round diff --git a/consensus/vote_set_test.go b/consensus/vote_set_test.go index c18892f23..d80b99e76 100644 --- a/consensus/vote_set_test.go +++ b/consensus/vote_set_test.go @@ -3,10 +3,10 @@ package consensus import ( "bytes" - . "github.com/tendermint/tendermint/common" - . "github.com/tendermint/tendermint/common/test" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint2/common/test" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" "testing" ) diff --git a/daemon/daemon.go b/daemon/daemon.go index 6e14b0e29..c2bb765f3 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -4,16 +4,16 @@ import ( "os" "os/signal" - bc "github.com/tendermint/tendermint/blockchain" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/consensus" - dbm "github.com/tendermint/tendermint/db" - mempl "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/rpc" - "github.com/tendermint/tendermint/rpc/core" - sm "github.com/tendermint/tendermint/state" + bc "github.com/tendermint/tendermint2/blockchain" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint2/consensus" + dbm "github.com/tendermint/tendermint2/db" + mempl "github.com/tendermint/tendermint2/mempool" + "github.com/tendermint/tendermint2/p2p" + "github.com/tendermint/tendermint2/rpc" + "github.com/tendermint/tendermint2/rpc/core" + sm "github.com/tendermint/tendermint2/state" ) type Node struct { diff --git a/daemon/log.go b/daemon/log.go index b325cd802..e70f3eb8f 100644 --- a/daemon/log.go +++ b/daemon/log.go @@ -1,7 +1,7 @@ package daemon import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "daemon") diff --git a/db/db.go b/db/db.go index 3300727f5..9953829a5 100644 --- a/db/db.go +++ b/db/db.go @@ -3,8 +3,8 @@ package db import ( "path" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/config" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/config" ) type DB interface { diff --git a/logger/log.go b/logger/log.go index 62f898098..ddc6a7799 100644 --- a/logger/log.go +++ b/logger/log.go @@ -5,8 +5,8 @@ import ( "os" "github.com/tendermint/log15" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/config" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/config" ) var rootHandler log15.Handler diff --git a/mempool/log.go b/mempool/log.go index 0bc62b105..137b052f2 100644 --- a/mempool/log.go +++ b/mempool/log.go @@ -1,7 +1,7 @@ package mempool import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "mempool") diff --git a/mempool/mempool.go b/mempool/mempool.go index 819198778..a7b08cad4 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -11,9 +11,9 @@ package mempool import ( "sync" - "github.com/tendermint/tendermint/binary" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/binary" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) type Mempool struct { diff --git a/mempool/reactor.go b/mempool/reactor.go index e16cf9332..c82acec47 100644 --- a/mempool/reactor.go +++ b/mempool/reactor.go @@ -5,9 +5,9 @@ import ( "fmt" "sync/atomic" - "github.com/tendermint/tendermint/binary" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint2/p2p" + "github.com/tendermint/tendermint2/types" ) var ( diff --git a/merkle/iavl_node.go b/merkle/iavl_node.go index 6d7d5d634..44533b870 100644 --- a/merkle/iavl_node.go +++ b/merkle/iavl_node.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "io" - "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint2/binary" ) // Node diff --git a/merkle/iavl_test.go b/merkle/iavl_test.go index dd7897e86..5df499c78 100644 --- a/merkle/iavl_test.go +++ b/merkle/iavl_test.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/db" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/db" "runtime" "testing" diff --git a/merkle/iavl_tree.go b/merkle/iavl_tree.go index da474318b..7f5b604ac 100644 --- a/merkle/iavl_tree.go +++ b/merkle/iavl_tree.go @@ -5,9 +5,9 @@ import ( "container/list" "sync" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - dbm "github.com/tendermint/tendermint/db" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + dbm "github.com/tendermint/tendermint2/db" ) /* diff --git a/merkle/simple_tree.go b/merkle/simple_tree.go index bdc9164d8..c91cc48b6 100644 --- a/merkle/simple_tree.go +++ b/merkle/simple_tree.go @@ -28,7 +28,7 @@ import ( "bytes" "crypto/sha256" - "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint2/binary" ) func HashFromTwoHashes(left []byte, right []byte) []byte { diff --git a/merkle/simple_tree_test.go b/merkle/simple_tree_test.go index 893a30ce9..78add22e6 100644 --- a/merkle/simple_tree_test.go +++ b/merkle/simple_tree_test.go @@ -1,7 +1,7 @@ package merkle import ( - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" "bytes" "testing" diff --git a/p2p/addrbook.go b/p2p/addrbook.go index 893cf1c9e..a90fce5e6 100644 --- a/p2p/addrbook.go +++ b/p2p/addrbook.go @@ -15,7 +15,7 @@ import ( "sync/atomic" "time" - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) const ( diff --git a/p2p/connection.go b/p2p/connection.go index c75538365..99dbc66c2 100644 --- a/p2p/connection.go +++ b/p2p/connection.go @@ -12,8 +12,8 @@ import ( flow "code.google.com/p/mxk/go1/flowcontrol" "github.com/tendermint/log15" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) const ( diff --git a/p2p/listener.go b/p2p/listener.go index f10e3199f..ef7cd39bc 100644 --- a/p2p/listener.go +++ b/p2p/listener.go @@ -6,8 +6,8 @@ import ( "strconv" "sync/atomic" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/p2p/upnp" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/p2p/upnp" ) type Listener interface { diff --git a/p2p/log.go b/p2p/log.go index 7802aa767..641b6ea3c 100644 --- a/p2p/log.go +++ b/p2p/log.go @@ -1,7 +1,7 @@ package p2p import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "p2p") diff --git a/p2p/peer.go b/p2p/peer.go index 173297eb0..f54b79a38 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -6,8 +6,8 @@ import ( "net" "sync/atomic" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) type Peer struct { diff --git a/p2p/peer_set_test.go b/p2p/peer_set_test.go index 6a0c38ae2..7f6f5669a 100644 --- a/p2p/peer_set_test.go +++ b/p2p/peer_set_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) // Returns an empty dummy peer diff --git a/p2p/pex_reactor.go b/p2p/pex_reactor.go index 6af070589..c3d82a026 100644 --- a/p2p/pex_reactor.go +++ b/p2p/pex_reactor.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "time" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) var pexErrInvalidMessage = errors.New("Invalid PEX message") diff --git a/p2p/switch.go b/p2p/switch.go index 1eb513089..1cb4edbf8 100644 --- a/p2p/switch.go +++ b/p2p/switch.go @@ -6,7 +6,7 @@ import ( "net" "time" - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) type Reactor interface { diff --git a/p2p/switch_test.go b/p2p/switch_test.go index ffdb9950c..01b2d21fd 100644 --- a/p2p/switch_test.go +++ b/p2p/switch_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) type PeerMessage struct { diff --git a/p2p/upnp/log.go b/p2p/upnp/log.go index 49f53c863..de8d0a978 100644 --- a/p2p/upnp/log.go +++ b/p2p/upnp/log.go @@ -1,7 +1,7 @@ package upnp import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "upnp") diff --git a/p2p/upnp/probe.go b/p2p/upnp/probe.go index 6636c8870..287eef31f 100644 --- a/p2p/upnp/probe.go +++ b/p2p/upnp/probe.go @@ -6,7 +6,7 @@ import ( "net" "time" - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) type UPNPCapabilities struct { diff --git a/rpc/core/accounts.go b/rpc/core/accounts.go index 6949ab861..1d1fce95a 100644 --- a/rpc/core/accounts.go +++ b/rpc/core/accounts.go @@ -1,7 +1,7 @@ package core import ( - "github.com/tendermint/tendermint/account" + "github.com/tendermint/tendermint2/account" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/blocks.go b/rpc/core/blocks.go index 4bbe716c0..0e8c958c7 100644 --- a/rpc/core/blocks.go +++ b/rpc/core/blocks.go @@ -2,8 +2,8 @@ package core import ( "fmt" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/types" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/mempool.go b/rpc/core/mempool.go index 070d6e40d..3f51a2177 100644 --- a/rpc/core/mempool.go +++ b/rpc/core/mempool.go @@ -2,9 +2,9 @@ package core import ( "fmt" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/net.go b/rpc/core/net.go index 64db01cfa..020d9c194 100644 --- a/rpc/core/net.go +++ b/rpc/core/net.go @@ -1,10 +1,10 @@ package core import ( - "github.com/tendermint/tendermint/config" - dbm "github.com/tendermint/tendermint/db" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/config" + dbm "github.com/tendermint/tendermint2/db" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/pipe.go b/rpc/core/pipe.go index ca2d9db20..4776a4e39 100644 --- a/rpc/core/pipe.go +++ b/rpc/core/pipe.go @@ -1,10 +1,10 @@ package core import ( - bc "github.com/tendermint/tendermint/blockchain" - "github.com/tendermint/tendermint/consensus" - mempl "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/p2p" + bc "github.com/tendermint/tendermint2/blockchain" + "github.com/tendermint/tendermint2/consensus" + mempl "github.com/tendermint/tendermint2/mempool" + "github.com/tendermint/tendermint2/p2p" ) var blockStore *bc.BlockStore diff --git a/rpc/core/responses.go b/rpc/core/responses.go index 3e6e32e6a..6a1ac5824 100644 --- a/rpc/core/responses.go +++ b/rpc/core/responses.go @@ -1,9 +1,9 @@ package core import ( - "github.com/tendermint/tendermint/account" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint2/types" ) type ResponseGenPrivAccount struct { diff --git a/rpc/core/txs.go b/rpc/core/txs.go index 95b9fb552..d33079e7b 100644 --- a/rpc/core/txs.go +++ b/rpc/core/txs.go @@ -2,8 +2,8 @@ package core import ( "fmt" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/validators.go b/rpc/core/validators.go index 5d156156d..ebf35e224 100644 --- a/rpc/core/validators.go +++ b/rpc/core/validators.go @@ -1,7 +1,7 @@ package core import ( - sm "github.com/tendermint/tendermint/state" + sm "github.com/tendermint/tendermint2/state" ) //----------------------------------------------------------------------------- diff --git a/rpc/handlers.go b/rpc/handlers.go index 47b63e6c4..925dbe930 100644 --- a/rpc/handlers.go +++ b/rpc/handlers.go @@ -7,8 +7,8 @@ TODO: support Call && GetStorage. import ( "encoding/json" "fmt" - "github.com/tendermint/tendermint/binary" - "github.com/tendermint/tendermint/rpc/core" + "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint2/rpc/core" "io/ioutil" "net/http" "reflect" diff --git a/rpc/http_params.go b/rpc/http_params.go index 1837fd762..af7e23d4e 100644 --- a/rpc/http_params.go +++ b/rpc/http_params.go @@ -6,7 +6,7 @@ import ( "regexp" "strconv" - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) var ( diff --git a/rpc/http_server.go b/rpc/http_server.go index 5428d8bb0..76e0caf0c 100644 --- a/rpc/http_server.go +++ b/rpc/http_server.go @@ -8,10 +8,10 @@ import ( "runtime/debug" "time" - "github.com/tendermint/tendermint/alert" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/config" + "github.com/tendermint/tendermint2/alert" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/config" ) func StartHTTPServer() { diff --git a/rpc/test/http_rpc_test.go b/rpc/test/http_rpc_test.go index fa0eb29c7..4de03b783 100644 --- a/rpc/test/http_rpc_test.go +++ b/rpc/test/http_rpc_test.go @@ -5,11 +5,11 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/tendermint/tendermint/binary" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/merkle" - "github.com/tendermint/tendermint/rpc/core" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint2/merkle" + "github.com/tendermint/tendermint2/rpc/core" + "github.com/tendermint/tendermint2/types" "io/ioutil" "net/http" "net/url" diff --git a/rpc/test/json_rpc_test.go b/rpc/test/json_rpc_test.go index f55bddda8..5d44429a5 100644 --- a/rpc/test/json_rpc_test.go +++ b/rpc/test/json_rpc_test.go @@ -5,12 +5,12 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/rpc" - "github.com/tendermint/tendermint/rpc/core" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint2/rpc" + "github.com/tendermint/tendermint2/rpc/core" + "github.com/tendermint/tendermint2/types" "io/ioutil" "net/http" "net/url" diff --git a/rpc/test/test.go b/rpc/test/test.go index e79e42922..d65151d8e 100644 --- a/rpc/test/test.go +++ b/rpc/test/test.go @@ -4,15 +4,15 @@ import ( "bytes" "encoding/hex" "encoding/json" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/daemon" - "github.com/tendermint/tendermint/logger" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/rpc" - "github.com/tendermint/tendermint/rpc/core" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint2/daemon" + "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint2/p2p" + "github.com/tendermint/tendermint2/rpc" + "github.com/tendermint/tendermint2/rpc/core" + "github.com/tendermint/tendermint2/types" "io/ioutil" "net/http" "net/url" diff --git a/state/block_cache.go b/state/block_cache.go index c900accc7..066a70f02 100644 --- a/state/block_cache.go +++ b/state/block_cache.go @@ -4,11 +4,11 @@ import ( "bytes" "sort" - ac "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - dbm "github.com/tendermint/tendermint/db" - "github.com/tendermint/tendermint/merkle" + ac "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + dbm "github.com/tendermint/tendermint2/db" + "github.com/tendermint/tendermint2/merkle" ) func makeStorage(db dbm.DB, root []byte) merkle.Tree { diff --git a/state/common.go b/state/common.go index 342d35779..da90f79a9 100644 --- a/state/common.go +++ b/state/common.go @@ -1,9 +1,9 @@ package state import ( - ac "github.com/tendermint/tendermint/account" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/vm" + ac "github.com/tendermint/tendermint2/account" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/vm" ) type AccountGetter interface { diff --git a/state/execution.go b/state/execution.go index d7b3b78f7..97e617b75 100644 --- a/state/execution.go +++ b/state/execution.go @@ -4,10 +4,10 @@ import ( "bytes" "errors" - "github.com/tendermint/tendermint/account" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/types" - "github.com/tendermint/tendermint/vm" + "github.com/tendermint/tendermint2/account" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint2/vm" ) // NOTE: If an error occurs during block execution, state will be left diff --git a/state/genesis.go b/state/genesis.go index 9b75db976..a3174adc4 100644 --- a/state/genesis.go +++ b/state/genesis.go @@ -4,12 +4,12 @@ import ( "io/ioutil" "time" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - dbm "github.com/tendermint/tendermint/db" - "github.com/tendermint/tendermint/merkle" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + dbm "github.com/tendermint/tendermint2/db" + "github.com/tendermint/tendermint2/merkle" + "github.com/tendermint/tendermint2/types" ) type GenesisAccount struct { diff --git a/state/log.go b/state/log.go index 7f1d3eba2..5637d0cf7 100644 --- a/state/log.go +++ b/state/log.go @@ -1,7 +1,7 @@ package state import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "state") diff --git a/state/priv_validator.go b/state/priv_validator.go index 733d1151c..9a58aa357 100644 --- a/state/priv_validator.go +++ b/state/priv_validator.go @@ -9,12 +9,12 @@ import ( "math" "sync" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/config" - . "github.com/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/config" + . "github.com/tendermint/tendermint2/consensus/types" + "github.com/tendermint/tendermint2/types" "github.com/tendermint/ed25519" ) diff --git a/state/state.go b/state/state.go index 700202b87..093d17a1d 100644 --- a/state/state.go +++ b/state/state.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - dbm "github.com/tendermint/tendermint/db" - "github.com/tendermint/tendermint/merkle" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + dbm "github.com/tendermint/tendermint2/db" + "github.com/tendermint/tendermint2/merkle" + "github.com/tendermint/tendermint2/types" ) var ( diff --git a/state/state_test.go b/state/state_test.go index 5f2990652..6620c4423 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -1,9 +1,9 @@ package state import ( - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint2/types" "bytes" "testing" diff --git a/state/test.go b/state/test.go index 49ba0d5e3..f5b96c01b 100644 --- a/state/test.go +++ b/state/test.go @@ -4,10 +4,10 @@ import ( "bytes" "sort" - "github.com/tendermint/tendermint/account" - . "github.com/tendermint/tendermint/common" - dbm "github.com/tendermint/tendermint/db" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + . "github.com/tendermint/tendermint2/common" + dbm "github.com/tendermint/tendermint2/db" + "github.com/tendermint/tendermint2/types" "io/ioutil" "os" diff --git a/state/tx_cache.go b/state/tx_cache.go index d4188db3c..4adaef4fa 100644 --- a/state/tx_cache.go +++ b/state/tx_cache.go @@ -1,10 +1,10 @@ package state import ( - ac "github.com/tendermint/tendermint/account" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/vm" - "github.com/tendermint/tendermint/vm/sha3" + ac "github.com/tendermint/tendermint2/account" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/vm" + "github.com/tendermint/tendermint2/vm/sha3" ) type TxCache struct { diff --git a/state/validator.go b/state/validator.go index 17cbeb5a5..81800f172 100644 --- a/state/validator.go +++ b/state/validator.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint2/types" ) // Persistent (mostly) static data for each Validator diff --git a/state/validator_set.go b/state/validator_set.go index 09589a9db..4c0aafd6c 100644 --- a/state/validator_set.go +++ b/state/validator_set.go @@ -7,10 +7,10 @@ import ( "sort" "strings" - "github.com/tendermint/tendermint/account" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/merkle" - "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint2/account" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/merkle" + "github.com/tendermint/tendermint2/types" ) // ValidatorSet represent a set of *Validator at a given height. diff --git a/state/validator_set_test.go b/state/validator_set_test.go index 0153c1440..2d260b2b4 100644 --- a/state/validator_set_test.go +++ b/state/validator_set_test.go @@ -1,8 +1,8 @@ package state import ( - "github.com/tendermint/tendermint/account" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/account" + . "github.com/tendermint/tendermint2/common" "bytes" "testing" diff --git a/types/block.go b/types/block.go index c00e90ccb..e9b643fe2 100644 --- a/types/block.go +++ b/types/block.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/merkle" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint2/merkle" ) type Block struct { diff --git a/types/log.go b/types/log.go index fed0c559f..cf0c93c9e 100644 --- a/types/log.go +++ b/types/log.go @@ -1,7 +1,7 @@ package types import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "types") diff --git a/types/part_set.go b/types/part_set.go index d403809d1..96245c174 100644 --- a/types/part_set.go +++ b/types/part_set.go @@ -9,8 +9,8 @@ import ( "strings" "sync" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/merkle" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/merkle" ) const ( diff --git a/types/part_set_test.go b/types/part_set_test.go index d27a85c4d..d6c463b97 100644 --- a/types/part_set_test.go +++ b/types/part_set_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) func TestBasicPartSet(t *testing.T) { diff --git a/types/tx.go b/types/tx.go index 31af05b7a..00510959f 100644 --- a/types/tx.go +++ b/types/tx.go @@ -4,9 +4,9 @@ import ( "errors" "io" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) var ( diff --git a/types/vote.go b/types/vote.go index 3e3a30e08..80b672f33 100644 --- a/types/vote.go +++ b/types/vote.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint/account" - "github.com/tendermint/tendermint/binary" - . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint2/account" + "github.com/tendermint/tendermint2/binary" + . "github.com/tendermint/tendermint2/common" ) var ( diff --git a/vm/log.go b/vm/log.go index 9862495b0..44feecef4 100644 --- a/vm/log.go +++ b/vm/log.go @@ -1,7 +1,7 @@ package vm import ( - "github.com/tendermint/tendermint/logger" + "github.com/tendermint/tendermint2/logger" ) var log = logger.New("module", "vm") diff --git a/vm/native.go b/vm/native.go index ad9f3f3ae..0b6cdca13 100644 --- a/vm/native.go +++ b/vm/native.go @@ -3,9 +3,9 @@ package vm import ( "code.google.com/p/go.crypto/ripemd160" "crypto/sha256" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/vm/secp256k1" - "github.com/tendermint/tendermint/vm/sha3" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/vm/secp256k1" + "github.com/tendermint/tendermint2/vm/sha3" ) var nativeContracts = make(map[Word256]NativeContract) diff --git a/vm/stack.go b/vm/stack.go index 6b74643ac..5f663d8fe 100644 --- a/vm/stack.go +++ b/vm/stack.go @@ -2,7 +2,7 @@ package vm import ( "fmt" - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) // Not goroutine safe diff --git a/vm/test/fake_app_state.go b/vm/test/fake_app_state.go index 3d6f5ca22..9f2734257 100644 --- a/vm/test/fake_app_state.go +++ b/vm/test/fake_app_state.go @@ -1,9 +1,9 @@ package vm import ( - . "github.com/tendermint/tendermint/common" - . "github.com/tendermint/tendermint/vm" - "github.com/tendermint/tendermint/vm/sha3" + . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint2/vm" + "github.com/tendermint/tendermint2/vm/sha3" ) type FakeAppState struct { diff --git a/vm/test/vm_test.go b/vm/test/vm_test.go index ee3fe7e57..162a1b977 100644 --- a/vm/test/vm_test.go +++ b/vm/test/vm_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - . "github.com/tendermint/tendermint/common" - . "github.com/tendermint/tendermint/vm" + . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint2/vm" ) func newAppState() *FakeAppState { diff --git a/vm/types.go b/vm/types.go index 443b72c63..a8a334b60 100644 --- a/vm/types.go +++ b/vm/types.go @@ -1,7 +1,7 @@ package vm import ( - . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint2/common" ) const ( diff --git a/vm/vm.go b/vm/vm.go index cbf68729d..6983f5abb 100644 --- a/vm/vm.go +++ b/vm/vm.go @@ -5,8 +5,8 @@ import ( "fmt" "math/big" - . "github.com/tendermint/tendermint/common" - "github.com/tendermint/tendermint/vm/sha3" + . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint2/vm/sha3" ) var (