akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lnwire: change the FeePerKb field to FeePerKw

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2017-05-16 19:06:19 -07:00
parent e689ef61dd
commit b671a50157
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lnwire/lnwire_test.go
View File

@ -144,7 +144,7 @@ func TestLightningWireProtocol(t *testing.T) {
req := SingleFundingRequest{ req := SingleFundingRequest{
ChannelType: uint8(r.Int63()), ChannelType: uint8(r.Int63()),
CoinType: uint64(r.Int63()), CoinType: uint64(r.Int63()),
FeePerKb: btcutil.Amount(r.Int63()), FeePerKw: btcutil.Amount(r.Int63()),
FundingAmount: btcutil.Amount(r.Int63()), FundingAmount: btcutil.Amount(r.Int63()),
PushSatoshis: btcutil.Amount(r.Int63()), PushSatoshis: btcutil.Amount(r.Int63()),
CsvDelay: uint32(r.Int31()), CsvDelay: uint32(r.Int31()),

14
lnwire/single_funding_request.go
View File

@ -34,11 +34,11 @@ type SingleFundingRequest struct {
// of the Bitcoin blockchain. // of the Bitcoin blockchain.
CoinType uint64 CoinType uint64
// FeePerKb is the required number of satoshis per KB that the // FeePerKw is the required number of satoshis per kilo-weight that the
// requester will pay at all timers, for both the funding transaction // requester will pay at all timers, for both the funding transaction
// and commitment transaction. This value can later be updated once the // and commitment transaction. This value can later be updated once the
// channel is open. // channel is open.
FeePerKb btcutil.Amount FeePerKw btcutil.Amount
// FundingAmount is the number of satoshis the initiator would like // FundingAmount is the number of satoshis the initiator would like
// to commit to the channel. // to commit to the channel.
@ -84,7 +84,7 @@ type SingleFundingRequest struct {
// NewSingleFundingRequest creates, and returns a new empty SingleFundingRequest. // NewSingleFundingRequest creates, and returns a new empty SingleFundingRequest.
func NewSingleFundingRequest(chanID [32]byte, chanType uint8, coinType uint64, func NewSingleFundingRequest(chanID [32]byte, chanType uint8, coinType uint64,
fee btcutil.Amount, amt btcutil.Amount, delay uint32, ck, feePerKw btcutil.Amount, amt btcutil.Amount, delay uint32, ck,
cdp *btcec.PublicKey, deliveryScript PkScript, cdp *btcec.PublicKey, deliveryScript PkScript,
dustLimit btcutil.Amount, pushSat btcutil.Amount, dustLimit btcutil.Amount, pushSat btcutil.Amount,
confDepth uint32) *SingleFundingRequest { confDepth uint32) *SingleFundingRequest {
@ -93,7 +93,7 @@ func NewSingleFundingRequest(chanID [32]byte, chanType uint8, coinType uint64,
PendingChannelID: chanID, PendingChannelID: chanID,
ChannelType: chanType, ChannelType: chanType,
CoinType: coinType, CoinType: coinType,
FeePerKb: fee, FeePerKw: feePerKw,
FundingAmount: amt, FundingAmount: amt,
CsvDelay: delay, CsvDelay: delay,
CommitmentKey: ck, CommitmentKey: ck,
@ -115,7 +115,7 @@ func (c *SingleFundingRequest) Decode(r io.Reader, pver uint32) error {
c.PendingChannelID[:], c.PendingChannelID[:],
&c.ChannelType, &c.ChannelType,
&c.CoinType, &c.CoinType,
&c.FeePerKb, &c.FeePerKw,
&c.FundingAmount, &c.FundingAmount,
&c.PushSatoshis, &c.PushSatoshis,
&c.CsvDelay, &c.CsvDelay,
@ -136,7 +136,7 @@ func (c *SingleFundingRequest) Encode(w io.Writer, pver uint32) error {
c.PendingChannelID[:], c.PendingChannelID[:],
c.ChannelType, c.ChannelType,
c.CoinType, c.CoinType,
c.FeePerKb, c.FeePerKw,
c.FundingAmount, c.FundingAmount,
c.PushSatoshis, c.PushSatoshis,
c.CsvDelay, c.CsvDelay,
@ -173,7 +173,7 @@ func (c *SingleFundingRequest) MaxPayloadLength(uint32) uint32 {
// CoinType - 8 bytes // CoinType - 8 bytes
length += 8 length += 8
// FeePerKb - 8 bytes // FeePerKw - 8 bytes
length += 8 length += 8
// FundingAmount - 8 bytes // FundingAmount - 8 bytes