channeldb+graphdb: init graph DB outside of channel db

We also now use the graph DB's own optional functions. An instance of
the graph is currently still passed to the channeldb's
`CreateWithBackend` function. This will be removed in a later commit
once the two have been completely disjoint.

channeldb/options.go

@@ -1,10 +1,7 @@
 package channeldb
 
 import (
-	"time"
-
 	"github.com/lightningnetwork/lnd/clock"
-	"github.com/lightningnetwork/lnd/kvdb"
 )
 
 const (
@@ -35,30 +32,8 @@ type OptionalMiragtionConfig struct {
 
 // Options holds parameters for tuning and customizing a channeldb.DB.
 type Options struct {
-	kvdb.BoltBackendConfig
 	OptionalMiragtionConfig
 
-	// RejectCacheSize is the maximum number of rejectCacheEntries to hold
-	// in the rejection cache.
-	RejectCacheSize int
-
-	// ChannelCacheSize is the maximum number of ChannelEdges to hold in the
-	// channel cache.
-	ChannelCacheSize int
-
-	// BatchCommitInterval is the maximum duration the batch schedulers will
-	// wait before attempting to commit a pending set of updates.
-	BatchCommitInterval time.Duration
-
-	// PreAllocCacheNumNodes is the number of nodes we expect to be in the
-	// graph cache, so we can pre-allocate the map accordingly.
-	PreAllocCacheNumNodes int
-
-	// UseGraphCache denotes whether the in-memory graph cache should be
-	// used or a fallback version that uses the underlying database for
-	// path finding.
-	UseGraphCache bool
-
 	// NoMigration specifies that underlying backend was opened in read-only
 	// mode and migrations shouldn't be performed. This can be useful for
 	// applications that use the channeldb package as a library.
@@ -87,17 +62,7 @@ type Options struct {
 // DefaultOptions returns an Options populated with default values.
 func DefaultOptions() Options {
 	return Options{
-		BoltBackendConfig: kvdb.BoltBackendConfig{
-			NoFreelistSync:    true,
-			AutoCompact:       false,
-			AutoCompactMinAge: kvdb.DefaultBoltAutoCompactMinAge,
-			DBTimeout:         kvdb.DefaultDBTimeout,
-		},
 		OptionalMiragtionConfig: OptionalMiragtionConfig{},
-		RejectCacheSize:         DefaultRejectCacheSize,
-		ChannelCacheSize:        DefaultChannelCacheSize,
-		PreAllocCacheNumNodes:   DefaultPreAllocCacheNumNodes,
-		UseGraphCache:           true,
 		NoMigration:             false,
 		clock:                   clock.NewDefaultClock(),
 	}
@@ -106,34 +71,6 @@ func DefaultOptions() Options {
 // OptionModifier is a function signature for modifying the default Options.
 type OptionModifier func(*Options)
 
-// OptionSetRejectCacheSize sets the RejectCacheSize to n.
-func OptionSetRejectCacheSize(n int) OptionModifier {
-	return func(o *Options) {
-		o.RejectCacheSize = n
-	}
-}
-
-// OptionSetChannelCacheSize sets the ChannelCacheSize to n.
-func OptionSetChannelCacheSize(n int) OptionModifier {
-	return func(o *Options) {
-		o.ChannelCacheSize = n
-	}
-}
-
-// OptionSetPreAllocCacheNumNodes sets the PreAllocCacheNumNodes to n.
-func OptionSetPreAllocCacheNumNodes(n int) OptionModifier {
-	return func(o *Options) {
-		o.PreAllocCacheNumNodes = n
-	}
-}
-
-// OptionSetUseGraphCache sets the UseGraphCache option to the given value.
-func OptionSetUseGraphCache(use bool) OptionModifier {
-	return func(o *Options) {
-		o.UseGraphCache = use
-	}
-}
-
 // OptionNoRevLogAmtData sets the NoRevLogAmtData option to the given value. If
 // it is set to true then amount data will not be stored in the revocation log.
 func OptionNoRevLogAmtData(noAmtData bool) OptionModifier {
@@ -142,36 +79,6 @@ func OptionNoRevLogAmtData(noAmtData bool) OptionModifier {
 	}
 }
 
-// OptionSetSyncFreelist allows the database to sync its freelist.
-func OptionSetSyncFreelist(b bool) OptionModifier {
-	return func(o *Options) {
-		o.NoFreelistSync = !b
-	}
-}
-
-// OptionAutoCompact turns on automatic database compaction on startup.
-func OptionAutoCompact() OptionModifier {
-	return func(o *Options) {
-		o.AutoCompact = true
-	}
-}
-
-// OptionAutoCompactMinAge sets the minimum age for automatic database
-// compaction.
-func OptionAutoCompactMinAge(minAge time.Duration) OptionModifier {
-	return func(o *Options) {
-		o.AutoCompactMinAge = minAge
-	}
-}
-
-// OptionSetBatchCommitInterval sets the batch commit interval for the internval
-// batch schedulers.
-func OptionSetBatchCommitInterval(interval time.Duration) OptionModifier {
-	return func(o *Options) {
-		o.BatchCommitInterval = interval
-	}
-}
-
 // OptionNoMigration allows the database to be opened in read only mode by
 // disabling migrations.
 func OptionNoMigration(b bool) OptionModifier {