fix import paths

libs/autofile/autofile.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 /* AutoFile usage

libs/autofile/autofile_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 func TestSIGHUP(t *testing.T) {

libs/autofile/cmd/logjack.go

@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-	auto "github.com/tendermint/tmlibs/autofile"
-	cmn "github.com/tendermint/tmlibs/common"
+	auto "github.com/tendermint/tendermint/libs/autofile"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 const Version = "0.0.1"

libs/autofile/group.go

@@ -15,7 +15,7 @@ import (
 	"sync"
 	"time"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 const (

libs/autofile/group_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 // NOTE: Returned group has ticker stopped

libs/bech32/bech32_test.go

@@ -5,7 +5,7 @@ import (
 	"crypto/sha256"
 	"testing"
 
-	"github.com/tendermint/tmlibs/bech32"
+	"github.com/tendermint/tendermint/libs/bech32"
 )
 
 func TestEncodeAndDecode(t *testing.T) {

libs/cli/flags/log_level.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/tendermint/tmlibs/log"
+	"github.com/tendermint/tendermint/libs/log"
 )
 
 const (

libs/cli/flags/log_level_test.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	tmflags "github.com/tendermint/tmlibs/cli/flags"
-	"github.com/tendermint/tmlibs/log"
+	tmflags "github.com/tendermint/tendermint/libs/cli/flags"
+	"github.com/tendermint/tendermint/libs/log"
 )
 
 const (

libs/common/repeat_timer_test.go

@@ -50,7 +50,7 @@ func TestRepeatTimer(t *testing.T) {
 		// TODO detect number of running
 		// goroutines to ensure that
 		// no other times will fire.
-		// See https://github.com/tendermint/tmlibs/issues/120.
+		// See https://github.com/tendermint/tendermint/libs/issues/120.
 		time.Sleep(time.Millisecond * 100)
 		done := true
 		select {

libs/common/service.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/tendermint/tmlibs/log"
+	"github.com/tendermint/tendermint/libs/log"
 )
 
 var (

libs/db/backend_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 func cleanupDBDir(dir, name string) {

libs/db/c_level_db_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 func BenchmarkRandomReadsWrites2(b *testing.B) {

libs/db/common_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 //----------------------------------------

libs/db/debug_db.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 func _fmt(f string, az ...interface{}) string {

libs/db/fsdb.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 
 	"github.com/pkg/errors"
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 const (

libs/db/go_level_db.go

@@ -10,7 +10,7 @@ import (
 	"github.com/syndtr/goleveldb/leveldb/iterator"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 func init() {

libs/db/go_level_db_test.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 func BenchmarkRandomReadsWrites(b *testing.B) {

libs/db/mem_db.go

@@ -114,7 +114,7 @@ func (db *MemDB) Close() {
 	// database, we don't have a destination
 	// to flush contents to nor do we want
 	// any data loss on invoking Close()
-	// See the discussion in https://github.com/tendermint/tmlibs/pull/56
+	// See the discussion in https://github.com/tendermint/tendermint/libs/pull/56
 }
 
 // Implements DB.

libs/db/remotedb/grpcdb/client.go

@@ -4,7 +4,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
-	protodb "github.com/tendermint/tmlibs/db/remotedb/proto"
+	protodb "github.com/tendermint/tendermint/libs/db/remotedb/proto"
 )
 
 // Security defines how the client will talk to the gRPC server.

libs/db/remotedb/grpcdb/example_test.go

@@ -5,8 +5,8 @@ import (
 	"context"
 	"log"
 
-	grpcdb "github.com/tendermint/tmlibs/db/remotedb/grpcdb"
-	protodb "github.com/tendermint/tmlibs/db/remotedb/proto"
+	grpcdb "github.com/tendermint/tendermint/libs/db/remotedb/grpcdb"
+	protodb "github.com/tendermint/tendermint/libs/db/remotedb/proto"
 )
 
 func Example() {

libs/db/remotedb/grpcdb/server.go

@@ -9,8 +9,8 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 
-	"github.com/tendermint/tmlibs/db"
-	protodb "github.com/tendermint/tmlibs/db/remotedb/proto"
+	"github.com/tendermint/tendermint/libs/db"
+	protodb "github.com/tendermint/tendermint/libs/db/remotedb/proto"
 )
 
 // ListenAndServe is a blocking function that sets up a gRPC based
@@ -58,7 +58,7 @@ var _ protodb.DBServer = (*server)(nil)
 //  * fsdb
 //  * memdB
 //  * leveldb
-// See https://godoc.org/github.com/tendermint/tmlibs/db#DBBackendType
+// See https://godoc.org/github.com/tendermint/tendermint/libs/db#DBBackendType
 func (s *server) Init(ctx context.Context, in *protodb.Init) (*protodb.Entity, error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()

libs/db/remotedb/remotedb.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/tendermint/tmlibs/db"
-	"github.com/tendermint/tmlibs/db/remotedb/grpcdb"
-	protodb "github.com/tendermint/tmlibs/db/remotedb/proto"
+	"github.com/tendermint/tendermint/libs/db"
+	"github.com/tendermint/tendermint/libs/db/remotedb/grpcdb"
+	protodb "github.com/tendermint/tendermint/libs/db/remotedb/proto"
 )
 
 type RemoteDB struct {

libs/db/remotedb/remotedb_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tmlibs/db/remotedb"
-	"github.com/tendermint/tmlibs/db/remotedb/grpcdb"
+	"github.com/tendermint/tendermint/libs/db/remotedb"
+	"github.com/tendermint/tendermint/libs/db/remotedb/grpcdb"
 )
 
 func TestRemoteDB(t *testing.T) {

libs/events/events.go

@@ -6,7 +6,7 @@ package events
 import (
 	"sync"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 // Generic event data can be typed and registered with tendermint/go-amino

libs/log/filter_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/tendermint/tmlibs/log"
+	"github.com/tendermint/tendermint/libs/log"
 )
 
 func TestVariousLevels(t *testing.T) {

libs/log/tm_logger_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/go-logfmt/logfmt"
-	"github.com/tendermint/tmlibs/log"
+	"github.com/tendermint/tendermint/libs/log"
 )
 
 func TestLoggerLogsItsErrors(t *testing.T) {

libs/log/tmfmt_logger_test.go

@@ -10,7 +10,7 @@ import (
 
 	kitlog "github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/assert"
-	"github.com/tendermint/tmlibs/log"
+	"github.com/tendermint/tendermint/libs/log"
 )
 
 func TestTMFmtLogger(t *testing.T) {

libs/log/tracing_logger_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
-	"github.com/tendermint/tmlibs/log"
+	"github.com/tendermint/tendermint/libs/log"
 )
 
 func TestTracingLogger(t *testing.T) {

libs/merkle/simple_map.go

@@ -1,8 +1,8 @@
 package merkle
 
 import (
-	cmn "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/tmlibs/merkle/tmhash"
+	cmn "github.com/tendermint/tendermint/libs/common"
+	"github.com/tendermint/tendermint/libs/merkle/tmhash"
 )
 
 type SimpleMap struct {

libs/merkle/simple_tree.go

@@ -25,7 +25,7 @@ For larger datasets, use IAVLTree.
 package merkle
 
 import (
-	"github.com/tendermint/tmlibs/merkle/tmhash"
+	"github.com/tendermint/tendermint/libs/merkle/tmhash"
 )
 
 func SimpleHashFromTwoHashes(left []byte, right []byte) []byte {

libs/merkle/simple_tree_test.go

@@ -3,8 +3,8 @@ package merkle
 import (
 	"bytes"
 
-	cmn "github.com/tendermint/tmlibs/common"
-	. "github.com/tendermint/tmlibs/test"
+	cmn "github.com/tendermint/tendermint/libs/common"
+	. "github.com/tendermint/tendermint/libs/test"
 
 	"testing"
 )

libs/merkle/tmhash/hash_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/tendermint/tmlibs/merkle/tmhash"
+	"github.com/tendermint/tendermint/libs/merkle/tmhash"
 )
 
 func TestHash(t *testing.T) {

libs/pubsub/example_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tmlibs/log"
+	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/tendermint/tendermint/libs/pubsub"
 	"github.com/tendermint/tendermint/libs/pubsub/query"

libs/pubsub/pubsub.go

@@ -16,7 +16,7 @@ import (
 	"errors"
 	"sync"
 
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 type operation int

libs/pubsub/pubsub_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/tendermint/tmlibs/log"
+	"github.com/tendermint/tendermint/libs/log"
 
 	"github.com/tendermint/tendermint/libs/pubsub"
 	"github.com/tendermint/tendermint/libs/pubsub/query"

libs/test/mutate.go

@@ -1,7 +1,7 @@
 package test
 
 import (
-	cmn "github.com/tendermint/tmlibs/common"
+	cmn "github.com/tendermint/tendermint/libs/common"
 )
 
 // Contract: !bytes.Equal(input, output) && len(input) >= len(output)