BTCPrivate
/
lnd
mirror of https://github.com/BTCPrivate/lnd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

channeldb: remove TotalNetFees from OpenChannel 

This commit removes all prior fee tracking attributes along with the
persistence code from OpenChannel. The rationale is that fees actually
don’t exist at the channel level, and instead should be tracked at
higher level of abstraction as fees come from the inbound/outbound
satoshi spread.
This commit is contained in:
Olaoluwa Osuntokun 2016-11-15 18:47:05 -08:00
parent 729e586eb6
commit 9b41d814dc
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
2 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
channeldb/channel.go
View File

@ -173,7 +173,6 @@ type OpenChannel struct {
NumUpdates uint64 NumUpdates uint64
TotalSatoshisSent uint64 TotalSatoshisSent uint64
TotalSatoshisReceived uint64 TotalSatoshisReceived uint64
TotalNetFees uint64 // TODO(roasbeef): total fees paid too?
CreationTime time.Time // TODO(roasbeef): last update time? CreationTime time.Time // TODO(roasbeef): last update time?
Htlcs []*HTLC Htlcs []*HTLC
@ -583,9 +582,6 @@ func putOpenChannel(openChanBucket *bolt.Bucket, nodeChanBucket *bolt.Bucket,
if err := putChanTotalFlow(openChanBucket, channel); err != nil { if err := putChanTotalFlow(openChanBucket, channel); err != nil {
return err return err
} }
if err := putChanNetFee(openChanBucket, channel); err != nil {
return err
}
// Next, write out the fields of the channel update less frequently. // Next, write out the fields of the channel update less frequently.
if err := putChannelIDs(nodeChanBucket, channel); err != nil { if err := putChannelIDs(nodeChanBucket, channel); err != nil {
@ -665,9 +661,6 @@ func fetchOpenChannel(openChanBucket *bolt.Bucket, nodeChanBucket *bolt.Bucket,
if err = fetchChanTotalFlow(openChanBucket, channel); err != nil { if err = fetchChanTotalFlow(openChanBucket, channel); err != nil {
return nil, err return nil, err
} }
if err = fetchChanNetFee(openChanBucket, channel); err != nil {
return nil, err
}
return channel, nil return channel, nil
} }
@ -689,9 +682,6 @@ func deleteOpenChannel(openChanBucket *bolt.Bucket, nodeChanBucket *bolt.Bucket,
if err := deleteChanTotalFlow(openChanBucket, channelID); err != nil { if err := deleteChanTotalFlow(openChanBucket, channelID); err != nil {
return err return err
} }
if err := deleteChanNetFee(openChanBucket, channelID); err != nil {
return err
}
// Finally, delete all the fields directly within the node's channel // Finally, delete all the fields directly within the node's channel
// bucket. // bucket.
@ -925,47 +915,8 @@ func fetchChanTotalFlow(openChanBucket *bolt.Bucket, channel *OpenChannel) error
return nil return nil
} }
func putChanNetFee(openChanBucket *bolt.Bucket, channel *OpenChannel) error {
scratch := make([]byte, 8)
var b bytes.Buffer
if err := writeOutpoint(&b, channel.ChanID); err != nil {
return err
}
keyPrefix := make([]byte, 3+b.Len())
copy(keyPrefix, netFeesPrefix)
copy(keyPrefix[3:], b.Bytes())
byteOrder.PutUint64(scratch, uint64(channel.TotalNetFees))
return openChanBucket.Put(keyPrefix, scratch)
}
func deleteChanNetFee(openChanBucket *bolt.Bucket, chanID []byte) error {
keyPrefix := make([]byte, 3+len(chanID))
copy(keyPrefix, netFeesPrefix)
copy(keyPrefix[3:], chanID)
return openChanBucket.Delete(keyPrefix)
}
func fetchChanNetFee(openChanBucket *bolt.Bucket, channel *OpenChannel) error {
var b bytes.Buffer
if err := writeOutpoint(&b, channel.ChanID); err != nil {
return err
}
keyPrefix := make([]byte, 3+b.Len())
copy(keyPrefix, netFeesPrefix)
copy(keyPrefix[3:], b.Bytes())
feeBytes := openChanBucket.Get(keyPrefix)
channel.TotalNetFees = byteOrder.Uint64(feeBytes)
return nil
}
func putChannelIDs(nodeChanBucket *bolt.Bucket, channel *OpenChannel) error { func putChannelIDs(nodeChanBucket *bolt.Bucket, channel *OpenChannel) error {
// TODO(roabeef): just pass in chanID everywhere for puts // TODO(roasbeef): just pass in chanID everywhere for puts
var b bytes.Buffer var b bytes.Buffer
if err := writeOutpoint(&b, channel.ChanID); err != nil { if err := writeOutpoint(&b, channel.ChanID); err != nil {
return err return err
@ -1179,7 +1130,6 @@ func putChanFundingInfo(nodeChanBucket *bolt.Bucket, channel *OpenChannel) error
scratch := make([]byte, 8) scratch := make([]byte, 8)
byteOrder.PutUint64(scratch, uint64(channel.CreationTime.Unix())) byteOrder.PutUint64(scratch, uint64(channel.CreationTime.Unix()))
if _, err := b.Write(scratch); err != nil { if _, err := b.Write(scratch); err != nil {
return err return err
} }

1
channeldb/channel_test.go
View File

@ -159,7 +159,6 @@ func createTestChannelState(cdb *DB) (*OpenChannel, error) {
NumUpdates: 0, NumUpdates: 0,
TotalSatoshisSent: 8, TotalSatoshisSent: 8,
TotalSatoshisReceived: 2, TotalSatoshisReceived: 2,
TotalNetFees: 9,
CreationTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC), CreationTime: time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC),
Db: cdb, Db: cdb,
}, nil }, nil