kvdb: move channeldb/kvdb to top level

channeldb/migration21/current/current_encoding.go

@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/lightningnetwork/lnd/channeldb/kvdb"
 	lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
 	"github.com/lightningnetwork/lnd/channeldb/migration21/common"
+	"github.com/lightningnetwork/lnd/kvdb"
 )
 
 func serializeChanCommit(w io.Writer, c *common.ChannelCommitment) error { // nolint: dupl

channeldb/migration21/legacy/legacy_decoding.go

@@ -6,9 +6,9 @@ import (
 	"errors"
 	"io"
 
-	"github.com/lightningnetwork/lnd/channeldb/kvdb"
 	lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
 	"github.com/lightningnetwork/lnd/channeldb/migration21/common"
+	"github.com/lightningnetwork/lnd/kvdb"
 )
 
 func deserializeHtlcs(r io.Reader) ([]common.HTLC, error) {

channeldb/migration21/migration.go

@@ -5,11 +5,11 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/lightningnetwork/lnd/channeldb/kvdb"
 	lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
 	"github.com/lightningnetwork/lnd/channeldb/migration21/common"
 	"github.com/lightningnetwork/lnd/channeldb/migration21/current"
 	"github.com/lightningnetwork/lnd/channeldb/migration21/legacy"
+	"github.com/lightningnetwork/lnd/kvdb"
 )
 
 var (

channeldb/migration21/migration_test.go

@@ -11,12 +11,12 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/davecgh/go-spew/spew"
-	"github.com/lightningnetwork/lnd/channeldb/kvdb"
 	lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
 	"github.com/lightningnetwork/lnd/channeldb/migration21/common"
 	"github.com/lightningnetwork/lnd/channeldb/migration21/current"
 	"github.com/lightningnetwork/lnd/channeldb/migration21/legacy"
 	"github.com/lightningnetwork/lnd/channeldb/migtest"
+	"github.com/lightningnetwork/lnd/kvdb"
 )
 
 var (