From b6dda143d0d591f10f61e1cc7cef742a3d0b3883 Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Mon, 7 Oct 2019 13:20:09 +0200
Subject: [PATCH] sweep: use bbolt DB directly instead of channeldb

---
 server.go           | 2 +-
 sweep/store.go      | 5 ++---
 sweep/store_test.go | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/server.go b/server.go
index 6297fc85..ccf71ad3 100644
--- a/server.go
+++ b/server.go
@@ -764,7 +764,7 @@ func newServer(listenAddrs []net.Addr, chanDB *channeldb.DB,
 		sweep.DefaultBatchWindowDuration)
 
 	sweeperStore, err := sweep.NewSweeperStore(
-		chanDB, activeNetParams.GenesisHash,
+		chanDB.DB, activeNetParams.GenesisHash,
 	)
 	if err != nil {
 		srvrLog.Errorf("unable to create sweeper store: %v", err)
diff --git a/sweep/store.go b/sweep/store.go
index ef6ba99c..f1ca8475 100644
--- a/sweep/store.go
+++ b/sweep/store.go
@@ -9,7 +9,6 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/coreos/bbolt"
-	"github.com/lightningnetwork/lnd/channeldb"
 )
 
 var (
@@ -57,11 +56,11 @@ type SweeperStore interface {
 }
 
 type sweeperStore struct {
-	db *channeldb.DB
+	db *bbolt.DB
 }
 
 // NewSweeperStore returns a new store instance.
-func NewSweeperStore(db *channeldb.DB, chainHash *chainhash.Hash) (
+func NewSweeperStore(db *bbolt.DB, chainHash *chainhash.Hash) (
 	SweeperStore, error) {
 
 	err := db.Update(func(tx *bbolt.Tx) error {
diff --git a/sweep/store_test.go b/sweep/store_test.go
index 23714c78..6853c7bb 100644
--- a/sweep/store_test.go
+++ b/sweep/store_test.go
@@ -53,7 +53,7 @@ func TestStore(t *testing.T) {
 
 		testStore(t, func() (SweeperStore, error) {
 			var chain chainhash.Hash
-			return NewSweeperStore(cdb, &chain)
+			return NewSweeperStore(cdb.DB, &chain)
 		})
 	})
 	t.Run("mock", func(t *testing.T) {