diff --git a/Makefile b/Makefile index b6f8c0293..7531cbe04 100644 --- a/Makefile +++ b/Makefile @@ -3,19 +3,19 @@ all: build build: get_deps - go build -o tendermint github.com/tendermint/tendermint2/cmd + go build -o tendermint github.com/tendermint/tendermint/cmd build_race: get_deps - go build -race -o tendermint github.com/tendermint/tendermint2/cmd + go build -race -o tendermint github.com/tendermint/tendermint/cmd test: build - go test github.com/tendermint/tendermint2/... + go test github.com/tendermint/tendermint/... list_deps: - go list -f '{{join .Deps "\n"}}' github.com/tendermint/tendermint2/... | xargs go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}' + go list -f '{{join .Deps "\n"}}' github.com/tendermint/tendermint/... | xargs go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}' get_deps: - go get github.com/tendermint/tendermint2/... + go get github.com/tendermint/tendermint/... tendermint_root/priv_validator.json: tendermint_root/priv_validator.json.orig cp $< $@ diff --git a/account/account.go b/account/account.go index 4a219d1fd..520afd70c 100644 --- a/account/account.go +++ b/account/account.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint/binary" ) // Signable is an interface for all signable things. diff --git a/account/priv_account.go b/account/priv_account.go index a3525648d..23114893a 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/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) type PrivAccount struct { diff --git a/account/privkey.go b/account/privkey.go index 9cbb05b1c..bf088b5ea 100644 --- a/account/privkey.go +++ b/account/privkey.go @@ -2,8 +2,8 @@ package account import ( "github.com/tendermint/ed25519" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) // PrivKey is part of PrivAccount and state.PrivValidator. diff --git a/account/pubkey.go b/account/pubkey.go index 4d7064808..fa8dce578 100644 --- a/account/pubkey.go +++ b/account/pubkey.go @@ -4,8 +4,8 @@ import ( "errors" "github.com/tendermint/ed25519" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) // PubKey is part of Account and Validator. diff --git a/account/signature.go b/account/signature.go index a029eb31c..53678f723 100644 --- a/account/signature.go +++ b/account/signature.go @@ -3,8 +3,8 @@ package account import ( "fmt" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) // Signature is a part of Txs and consensus Votes. diff --git a/account/signature_test.go b/account/signature_test.go index 21afd84d2..8168c5c6c 100644 --- a/account/signature_test.go +++ b/account/signature_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/tendermint/ed25519" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) func TestSignAndValidate(t *testing.T) { diff --git a/alert/alert.go b/alert/alert.go index b3cace539..d761da2a9 100644 --- a/alert/alert.go +++ b/alert/alert.go @@ -5,7 +5,7 @@ import ( "time" "github.com/sfreiberg/gotwilio" - "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint/config" ) var lastAlertUnix int64 = 0 diff --git a/alert/email.go b/alert/email.go index 19f45c8c7..d484f6f26 100644 --- a/alert/email.go +++ b/alert/email.go @@ -13,7 +13,7 @@ import ( "regexp" "strings" - "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint/config" ) // Convenience function diff --git a/alert/log.go b/alert/log.go index 32b400661..0f0740e0c 100644 --- a/alert/log.go +++ b/alert/log.go @@ -1,7 +1,7 @@ package alert import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "alert") diff --git a/binary/log.go b/binary/log.go index 26bbbcea2..28586125a 100644 --- a/binary/log.go +++ b/binary/log.go @@ -2,7 +2,7 @@ package binary import ( "github.com/tendermint/log15" - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "binary") diff --git a/binary/reflect.go b/binary/reflect.go index 58ed9f293..251c040cc 100644 --- a/binary/reflect.go +++ b/binary/reflect.go @@ -9,7 +9,7 @@ import ( "sync" "time" - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) type TypeInfo struct { diff --git a/blockchain/log.go b/blockchain/log.go index caf3dcbaf..f04e99943 100644 --- a/blockchain/log.go +++ b/blockchain/log.go @@ -1,7 +1,7 @@ package blockchain import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "blockchain") diff --git a/blockchain/pool.go b/blockchain/pool.go index 2b2344e38..0bd620463 100644 --- a/blockchain/pool.go +++ b/blockchain/pool.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "time" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/types" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/types" ) const ( diff --git a/blockchain/pool_test.go b/blockchain/pool_test.go index 235a275c7..c07a11d85 100644 --- a/blockchain/pool_test.go +++ b/blockchain/pool_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/types" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/types" ) type testPeer struct { diff --git a/blockchain/reactor.go b/blockchain/reactor.go index 444355e6f..7e776ab07 100644 --- a/blockchain/reactor.go +++ b/blockchain/reactor.go @@ -7,11 +7,11 @@ import ( "sync/atomic" "time" - "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" + "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" ) const ( diff --git a/blockchain/store.go b/blockchain/store.go index 7a514fbce..f9d54cd23 100644 --- a/blockchain/store.go +++ b/blockchain/store.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" - dbm "github.com/tendermint/tendermint2/db" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" + dbm "github.com/tendermint/tendermint/db" + "github.com/tendermint/tendermint/types" ) /* diff --git a/cmd/gen_account.go b/cmd/gen_account.go index a19a4999e..aea29cf9d 100644 --- a/cmd/gen_account.go +++ b/cmd/gen_account.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/tendermint/tendermint2/account" - "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint/account" + "github.com/tendermint/tendermint/binary" ) func gen_account() { diff --git a/cmd/gen_tx.go b/cmd/gen_tx.go index a2d43bfef..687339bed 100644 --- a/cmd/gen_tx.go +++ b/cmd/gen_tx.go @@ -8,12 +8,12 @@ import ( "os" "strconv" - "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" + "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" ) func getString(prompt string) string { diff --git a/cmd/gen_validator.go b/cmd/gen_validator.go index 5058453c4..1d3af701e 100644 --- a/cmd/gen_validator.go +++ b/cmd/gen_validator.go @@ -3,9 +3,9 @@ package main import ( "fmt" - "github.com/tendermint/tendermint2/binary" - "github.com/tendermint/tendermint2/config" - sm "github.com/tendermint/tendermint2/state" + "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint/config" + sm "github.com/tendermint/tendermint/state" ) func gen_validator() { diff --git a/cmd/log.go b/cmd/log.go index d01ae5f3f..c04723782 100644 --- a/cmd/log.go +++ b/cmd/log.go @@ -1,7 +1,7 @@ package main import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "main") diff --git a/cmd/main.go b/cmd/main.go index 616457b3c..9d6b7574a 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/tendermint/tendermint2/config" - "github.com/tendermint/tendermint2/daemon" - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/config" + "github.com/tendermint/tendermint/daemon" + "github.com/tendermint/tendermint/logger" ) func main() { diff --git a/cmd/probe_upnp.go b/cmd/probe_upnp.go index 483623ce1..927e25484 100644 --- a/cmd/probe_upnp.go +++ b/cmd/probe_upnp.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/tendermint/tendermint2/p2p/upnp" + "github.com/tendermint/tendermint/p2p/upnp" ) func probe_upnp() { diff --git a/config/log.go b/config/log.go index 4597e4a0e..3cd8f430f 100644 --- a/config/log.go +++ b/config/log.go @@ -1,7 +1,7 @@ package config import ( - // We can't use github.com/tendermint/tendermint2/logger + // We can't use github.com/tendermint/tendermint/logger // because that would create a dependency cycle. "github.com/tendermint/log15" ) diff --git a/consensus/log.go b/consensus/log.go index ea3ff2725..0b3a33dba 100644 --- a/consensus/log.go +++ b/consensus/log.go @@ -1,7 +1,7 @@ package consensus import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "consensus") diff --git a/consensus/pol.go b/consensus/pol.go index 1fb71ba26..06784d588 100644 --- a/consensus/pol.go +++ b/consensus/pol.go @@ -3,11 +3,11 @@ package consensus import ( "fmt" - "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" + "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" ) // Each signature of a POL (proof-of-lock, see whitepaper) is diff --git a/consensus/pol_test.go b/consensus/pol_test.go index 7f3e65f1c..e1d67e4dd 100644 --- a/consensus/pol_test.go +++ b/consensus/pol_test.go @@ -1,10 +1,10 @@ package consensus import ( - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" - sm "github.com/tendermint/tendermint2/state" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" + sm "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/types" "bytes" "testing" diff --git a/consensus/reactor.go b/consensus/reactor.go index 52ce48e81..a3028b6d5 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -8,13 +8,13 @@ import ( "sync/atomic" "time" - "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" + "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" ) const ( diff --git a/consensus/state.go b/consensus/state.go index 82fed3354..8756df612 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -60,15 +60,15 @@ import ( "sync/atomic" "time" - "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" + "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" ) const ( diff --git a/consensus/state_test.go b/consensus/state_test.go index ac4ba36f8..60e54a692 100644 --- a/consensus/state_test.go +++ b/consensus/state_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/types" ) func TestSetupRound(t *testing.T) { diff --git a/consensus/test.go b/consensus/test.go index 798b597f6..397befa0d 100644 --- a/consensus/test.go +++ b/consensus/test.go @@ -3,10 +3,10 @@ package consensus import ( "sort" - bc "github.com/tendermint/tendermint2/blockchain" - dbm "github.com/tendermint/tendermint2/db" - mempl "github.com/tendermint/tendermint2/mempool" - sm "github.com/tendermint/tendermint2/state" + bc "github.com/tendermint/tendermint/blockchain" + dbm "github.com/tendermint/tendermint/db" + mempl "github.com/tendermint/tendermint/mempool" + sm "github.com/tendermint/tendermint/state" ) func randConsensusState() (*ConsensusState, []*sm.PrivValidator) { diff --git a/consensus/types/proposal.go b/consensus/types/proposal.go index 6e0235a30..a78570a53 100644 --- a/consensus/types/proposal.go +++ b/consensus/types/proposal.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint2/account" - "github.com/tendermint/tendermint2/binary" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/account" + "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint/types" ) var ( diff --git a/consensus/vote_set.go b/consensus/vote_set.go index f24485a4d..973d4b7a1 100644 --- a/consensus/vote_set.go +++ b/consensus/vote_set.go @@ -6,11 +6,11 @@ import ( "strings" "sync" - "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" + "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" ) // 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 d80b99e76..c18892f23 100644 --- a/consensus/vote_set_test.go +++ b/consensus/vote_set_test.go @@ -3,10 +3,10 @@ package consensus import ( "bytes" - . "github.com/tendermint/tendermint2/common" - . "github.com/tendermint/tendermint2/common/test" - sm "github.com/tendermint/tendermint2/state" - "github.com/tendermint/tendermint2/types" + . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint/common/test" + sm "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/types" "testing" ) diff --git a/daemon/daemon.go b/daemon/daemon.go index f548275e1..d38ecb27d 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -5,16 +5,16 @@ import ( "os/signal" "github.com/ebuchman/debora" - 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" + 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" ) type Node struct { @@ -173,7 +173,7 @@ func (n *Node) MempoolReactor() *mempl.MempoolReactor { // debora variables var ( AppName = "tendermint" - SrcPath = "github.com/tendermint/tendermint2/cmd" + SrcPath = "github.com/tendermint/tendermint/cmd" PublicKey = "30820122300d06092a864886f70d01010105000382010f003082010a0282010100dd861e9cd5a3f3fc27d46531aa9d87f5b63f6358fa00397482c4ab93abf4ab2e3ed75380fc714d52b5e80afc184f21d5732f2d6dacc23f0e802e585ee005347c2af0ad992ee5c11b2a96f72bcae78bef314ba4448b33c3a1df7a4d6e6a808d21dfeb67ef974c0357ba54649dbcd92ec2a8d3a510da747e70cb859a7f9b15a6eceb2179c225afd3f8fb15be38988f9b82622d855f343af5830ca30a5beff3905b618f6cc39142a60ff5840595265a1f7b9fbd504760667a1b2508097c1831fd13f54c794a08468d65db9e27aff0a889665ebd7de4a6e9a6c09b3811b6cda623be48e1214ba0f9b378441e2a02b3891bc8ec1ae7081988e15c2f53fa6512784b390203010001" DeboraCallPort = 56565 diff --git a/daemon/log.go b/daemon/log.go index e70f3eb8f..b325cd802 100644 --- a/daemon/log.go +++ b/daemon/log.go @@ -1,7 +1,7 @@ package daemon import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "daemon") diff --git a/db/db.go b/db/db.go index 9953829a5..3300727f5 100644 --- a/db/db.go +++ b/db/db.go @@ -3,8 +3,8 @@ package db import ( "path" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/config" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/config" ) type DB interface { diff --git a/logger/log.go b/logger/log.go index d3521fb5e..6edae8eac 100644 --- a/logger/log.go +++ b/logger/log.go @@ -5,8 +5,8 @@ import ( "os" "github.com/tendermint/log15" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/config" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/config" ) var rootHandler log15.Handler diff --git a/mempool/log.go b/mempool/log.go index 137b052f2..0bc62b105 100644 --- a/mempool/log.go +++ b/mempool/log.go @@ -1,7 +1,7 @@ package mempool import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "mempool") diff --git a/mempool/mempool.go b/mempool/mempool.go index a7b08cad4..819198778 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -11,9 +11,9 @@ package mempool import ( "sync" - "github.com/tendermint/tendermint2/binary" - sm "github.com/tendermint/tendermint2/state" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/binary" + sm "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/types" ) type Mempool struct { diff --git a/mempool/reactor.go b/mempool/reactor.go index c82acec47..e16cf9332 100644 --- a/mempool/reactor.go +++ b/mempool/reactor.go @@ -5,9 +5,9 @@ import ( "fmt" "sync/atomic" - "github.com/tendermint/tendermint2/binary" - "github.com/tendermint/tendermint2/p2p" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint/p2p" + "github.com/tendermint/tendermint/types" ) var ( diff --git a/merkle/iavl_node.go b/merkle/iavl_node.go index 44533b870..6d7d5d634 100644 --- a/merkle/iavl_node.go +++ b/merkle/iavl_node.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "io" - "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint/binary" ) // Node diff --git a/merkle/iavl_test.go b/merkle/iavl_test.go index 5df499c78..dd7897e86 100644 --- a/merkle/iavl_test.go +++ b/merkle/iavl_test.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/db" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/db" "runtime" "testing" diff --git a/merkle/iavl_tree.go b/merkle/iavl_tree.go index 7f5b604ac..da474318b 100644 --- a/merkle/iavl_tree.go +++ b/merkle/iavl_tree.go @@ -5,9 +5,9 @@ import ( "container/list" "sync" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" - dbm "github.com/tendermint/tendermint2/db" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" + dbm "github.com/tendermint/tendermint/db" ) /* diff --git a/merkle/simple_tree.go b/merkle/simple_tree.go index c91cc48b6..bdc9164d8 100644 --- a/merkle/simple_tree.go +++ b/merkle/simple_tree.go @@ -28,7 +28,7 @@ import ( "bytes" "crypto/sha256" - "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint/binary" ) func HashFromTwoHashes(left []byte, right []byte) []byte { diff --git a/merkle/simple_tree_test.go b/merkle/simple_tree_test.go index 78add22e6..893a30ce9 100644 --- a/merkle/simple_tree_test.go +++ b/merkle/simple_tree_test.go @@ -1,7 +1,7 @@ package merkle import ( - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" "bytes" "testing" diff --git a/p2p/addrbook.go b/p2p/addrbook.go index a90fce5e6..893cf1c9e 100644 --- a/p2p/addrbook.go +++ b/p2p/addrbook.go @@ -15,7 +15,7 @@ import ( "sync/atomic" "time" - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) const ( diff --git a/p2p/connection.go b/p2p/connection.go index 99dbc66c2..c75538365 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/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) const ( diff --git a/p2p/listener.go b/p2p/listener.go index ef7cd39bc..f10e3199f 100644 --- a/p2p/listener.go +++ b/p2p/listener.go @@ -6,8 +6,8 @@ import ( "strconv" "sync/atomic" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/p2p/upnp" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/p2p/upnp" ) type Listener interface { diff --git a/p2p/log.go b/p2p/log.go index 641b6ea3c..7802aa767 100644 --- a/p2p/log.go +++ b/p2p/log.go @@ -1,7 +1,7 @@ package p2p import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "p2p") diff --git a/p2p/peer.go b/p2p/peer.go index f54b79a38..173297eb0 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -6,8 +6,8 @@ import ( "net" "sync/atomic" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) type Peer struct { diff --git a/p2p/peer_set_test.go b/p2p/peer_set_test.go index 7f6f5669a..6a0c38ae2 100644 --- a/p2p/peer_set_test.go +++ b/p2p/peer_set_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) // Returns an empty dummy peer diff --git a/p2p/pex_reactor.go b/p2p/pex_reactor.go index 696974341..474676bda 100644 --- a/p2p/pex_reactor.go +++ b/p2p/pex_reactor.go @@ -8,8 +8,8 @@ import ( "time" "github.com/ebuchman/debora" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) var pexErrInvalidMessage = errors.New("Invalid PEX message") diff --git a/p2p/switch.go b/p2p/switch.go index 8a36fe652..43b3b4ab0 100644 --- a/p2p/switch.go +++ b/p2p/switch.go @@ -6,7 +6,7 @@ import ( "net" "time" - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) type Reactor interface { diff --git a/p2p/switch_test.go b/p2p/switch_test.go index 01b2d21fd..ffdb9950c 100644 --- a/p2p/switch_test.go +++ b/p2p/switch_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) type PeerMessage struct { diff --git a/p2p/upnp/log.go b/p2p/upnp/log.go index de8d0a978..49f53c863 100644 --- a/p2p/upnp/log.go +++ b/p2p/upnp/log.go @@ -1,7 +1,7 @@ package upnp import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "upnp") diff --git a/p2p/upnp/probe.go b/p2p/upnp/probe.go index 287eef31f..6636c8870 100644 --- a/p2p/upnp/probe.go +++ b/p2p/upnp/probe.go @@ -6,7 +6,7 @@ import ( "net" "time" - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) type UPNPCapabilities struct { diff --git a/rpc/client.go b/rpc/client.go index 5befacfc0..19b32a9b7 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -3,7 +3,7 @@ package rpc import ( "bytes" "fmt" - "github.com/tendermint/tendermint2/binary" + "github.com/tendermint/tendermint/binary" "io/ioutil" "net/http" "net/url" @@ -164,7 +164,7 @@ func argsToURLValues(argNames []string, args ...interface{}) (url.Values, error) // import statements we will need for the templates /*rpc-gen:imports: -github.com/tendermint/tendermint2/binary +github.com/tendermint/tendermint/binary net/http io/ioutil fmt diff --git a/rpc/client_methods.go b/rpc/client_methods.go index 54983c080..1bf5badcc 100644 --- a/rpc/client_methods.go +++ b/rpc/client_methods.go @@ -2,10 +2,10 @@ package rpc import ( "fmt" - "github.com/tendermint/tendermint2/account" - "github.com/tendermint/tendermint2/binary" - "github.com/tendermint/tendermint2/rpc/core" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/account" + "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint/rpc/core" + "github.com/tendermint/tendermint/types" "io/ioutil" "net/http" ) diff --git a/rpc/core/accounts.go b/rpc/core/accounts.go index 89179f442..4234656b5 100644 --- a/rpc/core/accounts.go +++ b/rpc/core/accounts.go @@ -2,8 +2,8 @@ package core import ( "fmt" - "github.com/tendermint/tendermint2/account" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/account" + . "github.com/tendermint/tendermint/common" ) func GenPrivAccount() (*ResponseGenPrivAccount, error) { diff --git a/rpc/core/blocks.go b/rpc/core/blocks.go index c314c825c..ee32cd2f4 100644 --- a/rpc/core/blocks.go +++ b/rpc/core/blocks.go @@ -2,8 +2,8 @@ package core import ( "fmt" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/types" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/mempool.go b/rpc/core/mempool.go index c55876d31..62a2c1091 100644 --- a/rpc/core/mempool.go +++ b/rpc/core/mempool.go @@ -2,9 +2,9 @@ package core import ( "fmt" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/state" - "github.com/tendermint/tendermint2/types" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/net.go b/rpc/core/net.go index 020d9c194..64db01cfa 100644 --- a/rpc/core/net.go +++ b/rpc/core/net.go @@ -1,10 +1,10 @@ package core import ( - "github.com/tendermint/tendermint2/config" - dbm "github.com/tendermint/tendermint2/db" - sm "github.com/tendermint/tendermint2/state" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/config" + dbm "github.com/tendermint/tendermint/db" + sm "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/pipe.go b/rpc/core/pipe.go index 9562bd533..c4548a75b 100644 --- a/rpc/core/pipe.go +++ b/rpc/core/pipe.go @@ -1,11 +1,11 @@ package core import ( - bc "github.com/tendermint/tendermint2/blockchain" - "github.com/tendermint/tendermint2/consensus" - mempl "github.com/tendermint/tendermint2/mempool" - "github.com/tendermint/tendermint2/p2p" - "github.com/tendermint/tendermint2/state" + bc "github.com/tendermint/tendermint/blockchain" + "github.com/tendermint/tendermint/consensus" + mempl "github.com/tendermint/tendermint/mempool" + "github.com/tendermint/tendermint/p2p" + "github.com/tendermint/tendermint/state" ) var blockStore *bc.BlockStore diff --git a/rpc/core/responses.go b/rpc/core/responses.go index 61f06d9c5..41cb22847 100644 --- a/rpc/core/responses.go +++ b/rpc/core/responses.go @@ -1,9 +1,9 @@ package core import ( - "github.com/tendermint/tendermint2/account" - sm "github.com/tendermint/tendermint2/state" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/account" + sm "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/types" ) type ResponseGenPrivAccount struct { diff --git a/rpc/core/txs.go b/rpc/core/txs.go index 37f062f25..655c06695 100644 --- a/rpc/core/txs.go +++ b/rpc/core/txs.go @@ -2,11 +2,11 @@ package core import ( "fmt" - "github.com/tendermint/tendermint2/account" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/state" - "github.com/tendermint/tendermint2/types" - "github.com/tendermint/tendermint2/vm" + "github.com/tendermint/tendermint/account" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint/vm" ) func toVMAccount(acc *account.Account) *vm.Account { diff --git a/rpc/core/validators.go b/rpc/core/validators.go index ebf35e224..5d156156d 100644 --- a/rpc/core/validators.go +++ b/rpc/core/validators.go @@ -1,7 +1,7 @@ package core import ( - sm "github.com/tendermint/tendermint2/state" + sm "github.com/tendermint/tendermint/state" ) //----------------------------------------------------------------------------- diff --git a/rpc/handlers.go b/rpc/handlers.go index 3b23399de..69ead12c0 100644 --- a/rpc/handlers.go +++ b/rpc/handlers.go @@ -7,8 +7,8 @@ TODO: support Call && GetStorage. import ( "encoding/json" "fmt" - "github.com/tendermint/tendermint2/binary" - "github.com/tendermint/tendermint2/rpc/core" + "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint/rpc/core" "io/ioutil" "net/http" "reflect" diff --git a/rpc/http_params.go b/rpc/http_params.go index cf4dec220..36dd122a1 100644 --- a/rpc/http_params.go +++ b/rpc/http_params.go @@ -6,7 +6,7 @@ import ( "regexp" "strconv" - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) var ( diff --git a/rpc/http_server.go b/rpc/http_server.go index 3999cf042..58c30924a 100644 --- a/rpc/http_server.go +++ b/rpc/http_server.go @@ -8,10 +8,10 @@ import ( "runtime/debug" "time" - "github.com/tendermint/tendermint2/alert" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/config" + "github.com/tendermint/tendermint/alert" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/config" ) func StartHTTPServer() { diff --git a/rpc/test/http_rpc_test.go b/rpc/test/http_rpc_test.go index e425f5a2a..c49683eb2 100644 --- a/rpc/test/http_rpc_test.go +++ b/rpc/test/http_rpc_test.go @@ -4,12 +4,12 @@ import ( "bytes" "encoding/hex" "fmt" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/merkle" - "github.com/tendermint/tendermint2/rpc/core" - "github.com/tendermint/tendermint2/state" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/merkle" + "github.com/tendermint/tendermint/rpc/core" + "github.com/tendermint/tendermint/state" + "github.com/tendermint/tendermint/types" "io/ioutil" "net/http" "testing" diff --git a/rpc/test/json_rpc_test.go b/rpc/test/json_rpc_test.go index b059e111e..8500bc21d 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/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" + "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" "io/ioutil" "net/http" "net/url" diff --git a/rpc/test/test.go b/rpc/test/test.go index 0b2035029..09bcd8fdb 100644 --- a/rpc/test/test.go +++ b/rpc/test/test.go @@ -3,16 +3,16 @@ package rpc import ( "bytes" "encoding/hex" - "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/state" - "github.com/tendermint/tendermint2/types" + "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/state" + "github.com/tendermint/tendermint/types" "io/ioutil" "net/http" "net/url" diff --git a/state/block_cache.go b/state/block_cache.go index 066a70f02..c900accc7 100644 --- a/state/block_cache.go +++ b/state/block_cache.go @@ -4,11 +4,11 @@ import ( "bytes" "sort" - 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" + 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" ) func makeStorage(db dbm.DB, root []byte) merkle.Tree { diff --git a/state/common.go b/state/common.go index da90f79a9..342d35779 100644 --- a/state/common.go +++ b/state/common.go @@ -1,9 +1,9 @@ package state import ( - ac "github.com/tendermint/tendermint2/account" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/vm" + ac "github.com/tendermint/tendermint/account" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/vm" ) type AccountGetter interface { diff --git a/state/execution.go b/state/execution.go index 97e617b75..d7b3b78f7 100644 --- a/state/execution.go +++ b/state/execution.go @@ -4,10 +4,10 @@ import ( "bytes" "errors" - "github.com/tendermint/tendermint2/account" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/types" - "github.com/tendermint/tendermint2/vm" + "github.com/tendermint/tendermint/account" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/types" + "github.com/tendermint/tendermint/vm" ) // NOTE: If an error occurs during block execution, state will be left diff --git a/state/genesis.go b/state/genesis.go index a3174adc4..9b75db976 100644 --- a/state/genesis.go +++ b/state/genesis.go @@ -4,12 +4,12 @@ import ( "io/ioutil" "time" - "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" + "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" ) type GenesisAccount struct { diff --git a/state/log.go b/state/log.go index 5637d0cf7..7f1d3eba2 100644 --- a/state/log.go +++ b/state/log.go @@ -1,7 +1,7 @@ package state import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "state") diff --git a/state/priv_validator.go b/state/priv_validator.go index 9a58aa357..733d1151c 100644 --- a/state/priv_validator.go +++ b/state/priv_validator.go @@ -9,12 +9,12 @@ import ( "math" "sync" - "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/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/ed25519" ) diff --git a/state/state.go b/state/state.go index 093d17a1d..700202b87 100644 --- a/state/state.go +++ b/state/state.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "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" + "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" ) var ( diff --git a/state/state_test.go b/state/state_test.go index 6620c4423..5f2990652 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -1,9 +1,9 @@ package state import ( - "github.com/tendermint/tendermint2/account" - "github.com/tendermint/tendermint2/config" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/account" + "github.com/tendermint/tendermint/config" + "github.com/tendermint/tendermint/types" "bytes" "testing" diff --git a/state/test.go b/state/test.go index f5b96c01b..49ba0d5e3 100644 --- a/state/test.go +++ b/state/test.go @@ -4,10 +4,10 @@ import ( "bytes" "sort" - "github.com/tendermint/tendermint2/account" - . "github.com/tendermint/tendermint2/common" - dbm "github.com/tendermint/tendermint2/db" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/account" + . "github.com/tendermint/tendermint/common" + dbm "github.com/tendermint/tendermint/db" + "github.com/tendermint/tendermint/types" "io/ioutil" "os" diff --git a/state/tx_cache.go b/state/tx_cache.go index 4adaef4fa..d4188db3c 100644 --- a/state/tx_cache.go +++ b/state/tx_cache.go @@ -1,10 +1,10 @@ package state import ( - ac "github.com/tendermint/tendermint2/account" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/vm" - "github.com/tendermint/tendermint2/vm/sha3" + ac "github.com/tendermint/tendermint/account" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/vm" + "github.com/tendermint/tendermint/vm/sha3" ) type TxCache struct { diff --git a/state/validator.go b/state/validator.go index 81800f172..17cbeb5a5 100644 --- a/state/validator.go +++ b/state/validator.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint2/account" - "github.com/tendermint/tendermint2/binary" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/account" + "github.com/tendermint/tendermint/binary" + "github.com/tendermint/tendermint/types" ) // Persistent (mostly) static data for each Validator diff --git a/state/validator_set.go b/state/validator_set.go index 4c0aafd6c..09589a9db 100644 --- a/state/validator_set.go +++ b/state/validator_set.go @@ -7,10 +7,10 @@ import ( "sort" "strings" - "github.com/tendermint/tendermint2/account" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/merkle" - "github.com/tendermint/tendermint2/types" + "github.com/tendermint/tendermint/account" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/merkle" + "github.com/tendermint/tendermint/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 2d260b2b4..0153c1440 100644 --- a/state/validator_set_test.go +++ b/state/validator_set_test.go @@ -1,8 +1,8 @@ package state import ( - "github.com/tendermint/tendermint2/account" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/account" + . "github.com/tendermint/tendermint/common" "bytes" "testing" diff --git a/types/block.go b/types/block.go index e9b643fe2..c00e90ccb 100644 --- a/types/block.go +++ b/types/block.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "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" + "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" ) type Block struct { diff --git a/types/log.go b/types/log.go index cf0c93c9e..fed0c559f 100644 --- a/types/log.go +++ b/types/log.go @@ -1,7 +1,7 @@ package types import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "types") diff --git a/types/part_set.go b/types/part_set.go index 96245c174..d403809d1 100644 --- a/types/part_set.go +++ b/types/part_set.go @@ -9,8 +9,8 @@ import ( "strings" "sync" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/merkle" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/merkle" ) const ( diff --git a/types/part_set_test.go b/types/part_set_test.go index d6c463b97..d27a85c4d 100644 --- a/types/part_set_test.go +++ b/types/part_set_test.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "testing" - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) func TestBasicPartSet(t *testing.T) { diff --git a/types/tx.go b/types/tx.go index 00510959f..31af05b7a 100644 --- a/types/tx.go +++ b/types/tx.go @@ -4,9 +4,9 @@ import ( "errors" "io" - "github.com/tendermint/tendermint2/account" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/account" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) var ( diff --git a/types/vote.go b/types/vote.go index 80b672f33..3e3a30e08 100644 --- a/types/vote.go +++ b/types/vote.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint2/account" - "github.com/tendermint/tendermint2/binary" - . "github.com/tendermint/tendermint2/common" + "github.com/tendermint/tendermint/account" + "github.com/tendermint/tendermint/binary" + . "github.com/tendermint/tendermint/common" ) var ( diff --git a/vm/log.go b/vm/log.go index 44feecef4..9862495b0 100644 --- a/vm/log.go +++ b/vm/log.go @@ -1,7 +1,7 @@ package vm import ( - "github.com/tendermint/tendermint2/logger" + "github.com/tendermint/tendermint/logger" ) var log = logger.New("module", "vm") diff --git a/vm/native.go b/vm/native.go index 0b6cdca13..ad9f3f3ae 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/tendermint2/common" - "github.com/tendermint/tendermint2/vm/secp256k1" - "github.com/tendermint/tendermint2/vm/sha3" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/vm/secp256k1" + "github.com/tendermint/tendermint/vm/sha3" ) var nativeContracts = make(map[Word256]NativeContract) diff --git a/vm/stack.go b/vm/stack.go index 5f663d8fe..6b74643ac 100644 --- a/vm/stack.go +++ b/vm/stack.go @@ -2,7 +2,7 @@ package vm import ( "fmt" - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) // Not goroutine safe diff --git a/vm/test/fake_app_state.go b/vm/test/fake_app_state.go index 9f2734257..3d6f5ca22 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/tendermint2/common" - . "github.com/tendermint/tendermint2/vm" - "github.com/tendermint/tendermint2/vm/sha3" + . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint/vm" + "github.com/tendermint/tendermint/vm/sha3" ) type FakeAppState struct { diff --git a/vm/test/vm_test.go b/vm/test/vm_test.go index 162a1b977..ee3fe7e57 100644 --- a/vm/test/vm_test.go +++ b/vm/test/vm_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - . "github.com/tendermint/tendermint2/common" - . "github.com/tendermint/tendermint2/vm" + . "github.com/tendermint/tendermint/common" + . "github.com/tendermint/tendermint/vm" ) func newAppState() *FakeAppState { diff --git a/vm/types.go b/vm/types.go index a8a334b60..443b72c63 100644 --- a/vm/types.go +++ b/vm/types.go @@ -1,7 +1,7 @@ package vm import ( - . "github.com/tendermint/tendermint2/common" + . "github.com/tendermint/tendermint/common" ) const ( diff --git a/vm/vm.go b/vm/vm.go index 6983f5abb..cbf68729d 100644 --- a/vm/vm.go +++ b/vm/vm.go @@ -5,8 +5,8 @@ import ( "fmt" "math/big" - . "github.com/tendermint/tendermint2/common" - "github.com/tendermint/tendermint2/vm/sha3" + . "github.com/tendermint/tendermint/common" + "github.com/tendermint/tendermint/vm/sha3" ) var (