From 0307f321ad296e8006c3b36efbb7e2b2202853a7 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Sat, 26 Dec 2015 00:08:04 -0600 Subject: [PATCH] lnwallet: switch LightningChannel struct to use channeldb instead of raw namespace --- lnwallet/channel.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lnwallet/channel.go b/lnwallet/channel.go index 0e6a5936..fb973ee2 100644 --- a/lnwallet/channel.go +++ b/lnwallet/channel.go @@ -10,7 +10,6 @@ import ( "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil/txsort" - "github.com/btcsuite/btcwallet/walletdb" ) const ( @@ -28,7 +27,7 @@ type LightningChannel struct { // commitment update, plus some other meta-data...Or just use OP_RETURN // to help out? // currently going for: nSequence/nLockTime overloading - channelNamespace walletdb.Namespace + channelDB *ChannelDB // stateMtx protects concurrent access to the state struct. stateMtx sync.RWMutex @@ -44,13 +43,13 @@ type LightningChannel struct { // newLightningChannel... func newLightningChannel(wallet *LightningWallet, events *chainntnfs.ChainNotifier, - dbNamespace walletdb.Namespace, state OpenChannelState) (*LightningChannel, error) { + chanDB *ChannelDB, state OpenChannelState) (*LightningChannel, error) { return &LightningChannel{ - wallet: wallet, - channelEvents: events, - channelNamespace: dbNamespace, - channelState: state, + wallet: wallet, + channelEvents: events, + channelDB: chanDB, + channelState: state, }, nil }