Package import path change

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 $< $@

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.

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 {

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.

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.

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.

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) {

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

alert/email.go

@@ -13,7 +13,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/tendermint/tendermint2/config"
+	"github.com/tendermint/tendermint/config"
 )
 
 // Convenience function

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")

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")

binary/reflect.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/tendermint/tendermint2/common"
+	. "github.com/tendermint/tendermint/common"
 )
 
 type TypeInfo struct {

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")

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 (

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 {

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 (

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"
 )
 
 /*

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() {

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 {

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() {

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")

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() {

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() {

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"
 )

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")

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

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"

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 (

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 (

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) {

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) {

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 (

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

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"
 )

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

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")

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 {

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

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")

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 {

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 (

merkle/iavl_node.go

@@ -4,7 +4,7 @@ import (
 	"crypto/sha256"
 	"io"
 
-	"github.com/tendermint/tendermint2/binary"
+	"github.com/tendermint/tendermint/binary"
 )
 
 // Node

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"

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"
 )
 
 /*

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 {

merkle/simple_tree_test.go

@@ -1,7 +1,7 @@
 package merkle
 
 import (
-	. "github.com/tendermint/tendermint2/common"
+	. "github.com/tendermint/tendermint/common"
 
 	"bytes"
 	"testing"

p2p/addrbook.go

@@ -15,7 +15,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	. "github.com/tendermint/tendermint2/common"
+	. "github.com/tendermint/tendermint/common"
 )
 
 const (

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 (

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 {

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")

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 {

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

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")

p2p/switch.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	. "github.com/tendermint/tendermint2/common"
+	. "github.com/tendermint/tendermint/common"
 )
 
 type Reactor interface {

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 {

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")

p2p/upnp/probe.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	. "github.com/tendermint/tendermint2/common"
+	. "github.com/tendermint/tendermint/common"
 )
 
 type UPNPCapabilities struct {

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

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"
 )

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) {

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"
 )
 
 //-----------------------------------------------------------------------------

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"
 )
 
 //-----------------------------------------------------------------------------

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"
 )
 
 //-----------------------------------------------------------------------------

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

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 {

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 {

rpc/core/validators.go

@@ -1,7 +1,7 @@
 package core
 
 import (
-	sm "github.com/tendermint/tendermint2/state"
+	sm "github.com/tendermint/tendermint/state"
 )
 
 //-----------------------------------------------------------------------------

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"

rpc/http_params.go

@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strconv"
 
-	. "github.com/tendermint/tendermint2/common"
+	. "github.com/tendermint/tendermint/common"
 )
 
 var (

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() {

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"

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"

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"

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 {

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 {

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

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 {

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")

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"
 )

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 (

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"

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"

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 {

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

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.

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"

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 {

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")

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 (

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) {

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 (

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 (

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")

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)

vm/stack.go

@@ -2,7 +2,7 @@ package vm
 
 import (
 	"fmt"
-	. "github.com/tendermint/tendermint2/common"
+	. "github.com/tendermint/tendermint/common"
 )
 
 // Not goroutine safe

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 {

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 {

vm/types.go

@@ -1,7 +1,7 @@
 package vm
 
 import (
-	. "github.com/tendermint/tendermint2/common"
+	. "github.com/tendermint/tendermint/common"
 )
 
 const (

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 (