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

multi test: update tests/mocks to use EstimateFeePerVSize

Browse Source
This commit is contained in:
Johan T. Halseth 2018-02-13 15:15:14 +01:00
parent ba3f3e1942
commit 7b30425111
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
breacharbiter_test.go
View File

@ -1331,18 +1331,18 @@ func createInitChannels(revocationWindow int) (*lnwallet.LightningChannel, *lnwa
} }
estimator := &lnwallet.StaticFeeEstimator{FeeRate: 50} estimator := &lnwallet.StaticFeeEstimator{FeeRate: 50}
feePerWeight, err := estimator.EstimateFeePerWeight(1) feePerVSize, err := estimator.EstimateFeePerVSize(1)
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }
feePerKw := feePerWeight * 1000 feePerKw := feePerVSize.FeePerKWeight()
// TODO(roasbeef): need to factor in commit fee? // TODO(roasbeef): need to factor in commit fee?
aliceCommit := channeldb.ChannelCommitment{ aliceCommit := channeldb.ChannelCommitment{
CommitHeight: 0, CommitHeight: 0,
LocalBalance: lnwire.NewMSatFromSatoshis(channelBal), LocalBalance: lnwire.NewMSatFromSatoshis(channelBal),
RemoteBalance: lnwire.NewMSatFromSatoshis(channelBal), RemoteBalance: lnwire.NewMSatFromSatoshis(channelBal),
FeePerKw: feePerKw, FeePerKw: btcutil.Amount(feePerKw),
CommitFee: 8688, CommitFee: 8688,
CommitTx: aliceCommitTx, CommitTx: aliceCommitTx,
CommitSig: bytes.Repeat([]byte{1}, 71), CommitSig: bytes.Repeat([]byte{1}, 71),
@ -1351,7 +1351,7 @@ func createInitChannels(revocationWindow int) (*lnwallet.LightningChannel, *lnwa
CommitHeight: 0, CommitHeight: 0,
LocalBalance: lnwire.NewMSatFromSatoshis(channelBal), LocalBalance: lnwire.NewMSatFromSatoshis(channelBal),
RemoteBalance: lnwire.NewMSatFromSatoshis(channelBal), RemoteBalance: lnwire.NewMSatFromSatoshis(channelBal),
FeePerKw: feePerKw, FeePerKw: btcutil.Amount(feePerKw),
CommitFee: 8688, CommitFee: 8688,
CommitTx: bobCommitTx, CommitTx: bobCommitTx,
CommitSig: bytes.Repeat([]byte{1}, 71), CommitSig: bytes.Repeat([]byte{1}, 71),

2
mock.go
View File

@ -229,7 +229,7 @@ func (m *mockWalletController) FetchRootKey() (*btcec.PrivateKey, error) {
return m.rootKey, nil return m.rootKey, nil
} }
func (*mockWalletController) SendOutputs(outputs []*wire.TxOut, func (*mockWalletController) SendOutputs(outputs []*wire.TxOut,
_ btcutil.Amount) (*chainhash.Hash, error) { _ lnwallet.SatPerVByte) (*chainhash.Hash, error) {
return nil, nil return nil, nil
} }

9
peer_test.go
View File

@ -170,11 +170,12 @@ func TestPeerChannelClosureAcceptFeeInitiator(t *testing.T) {
} }
estimator := lnwallet.StaticFeeEstimator{FeeRate: 50} estimator := lnwallet.StaticFeeEstimator{FeeRate: 50}
feeRate, err := estimator.EstimateFeePerWeight(1) feeRate, err := estimator.EstimateFeePerVSize(1)
if err != nil { if err != nil {
t.Fatalf("unable to query fee estimator: %v", err) t.Fatalf("unable to query fee estimator: %v", err)
} }
fee := btcutil.Amount(responderChan.CalcFee(uint64(feeRate * 1000))) feePerKw := feeRate.FeePerKWeight()
fee := btcutil.Amount(responderChan.CalcFee(feePerKw))
closeSig, _, _, err := responderChan.CreateCloseProposal(fee, closeSig, _, _, err := responderChan.CreateCloseProposal(fee,
dummyDeliveryScript, initiatorDeliveryScript) dummyDeliveryScript, initiatorDeliveryScript)
if err != nil { if err != nil {
@ -460,12 +461,12 @@ func TestPeerChannelClosureFeeNegotiationsInitiator(t *testing.T) {
} }
estimator := lnwallet.StaticFeeEstimator{FeeRate: 50} estimator := lnwallet.StaticFeeEstimator{FeeRate: 50}
initiatorIdealFeeRate, err := estimator.EstimateFeePerWeight(1) initiatorIdealFeeRate, err := estimator.EstimateFeePerVSize(1)
if err != nil { if err != nil {
t.Fatalf("unable to query fee estimator: %v", err) t.Fatalf("unable to query fee estimator: %v", err)
} }
initiatorIdealFee := responderChan.CalcFee( initiatorIdealFee := responderChan.CalcFee(
uint64(initiatorIdealFeeRate * 1000), initiatorIdealFeeRate.FeePerKWeight(),
) )
increasedFee := btcutil.Amount(float64(initiatorIdealFee) * 2.5) increasedFee := btcutil.Amount(float64(initiatorIdealFee) * 2.5)
closeSig, _, _, err := responderChan.CreateCloseProposal( closeSig, _, _, err := responderChan.CreateCloseProposal(

12
test_utils.go
View File

@ -138,19 +138,19 @@ func createTestPeer(notifier chainntnfs.ChainNotifier,
} }
estimator := &lnwallet.StaticFeeEstimator{FeeRate: 50} estimator := &lnwallet.StaticFeeEstimator{FeeRate: 50}
feePerWeight, err := estimator.EstimateFeePerWeight(1) feePerVSize, err := estimator.EstimateFeePerVSize(1)
if err != nil { if err != nil {
return nil, nil, nil, nil, err return nil, nil, nil, nil, err
} }
feePerKw := feePerWeight * 1000 feePerKw := feePerVSize.FeePerKWeight()
// TODO(roasbeef): need to factor in commit fee? // TODO(roasbeef): need to factor in commit fee?
aliceCommit := channeldb.ChannelCommitment{ aliceCommit := channeldb.ChannelCommitment{
CommitHeight: 0, CommitHeight: 0,
LocalBalance: lnwire.NewMSatFromSatoshis(channelBal), LocalBalance: lnwire.NewMSatFromSatoshis(channelBal),
RemoteBalance: lnwire.NewMSatFromSatoshis(channelBal), RemoteBalance: lnwire.NewMSatFromSatoshis(channelBal),
FeePerKw: feePerKw, FeePerKw: btcutil.Amount(feePerKw),
CommitFee: 8688, CommitFee: feePerKw.FeeForWeight(lnwallet.CommitWeight),
CommitTx: aliceCommitTx, CommitTx: aliceCommitTx,
CommitSig: bytes.Repeat([]byte{1}, 71), CommitSig: bytes.Repeat([]byte{1}, 71),
} }
@ -158,8 +158,8 @@ func createTestPeer(notifier chainntnfs.ChainNotifier,
CommitHeight: 0, CommitHeight: 0,
LocalBalance: lnwire.NewMSatFromSatoshis(channelBal), LocalBalance: lnwire.NewMSatFromSatoshis(channelBal),
RemoteBalance: lnwire.NewMSatFromSatoshis(channelBal), RemoteBalance: lnwire.NewMSatFromSatoshis(channelBal),
FeePerKw: feePerKw, FeePerKw: btcutil.Amount(feePerKw),
CommitFee: 8688, CommitFee: feePerKw.FeeForWeight(lnwallet.CommitWeight),
CommitTx: bobCommitTx, CommitTx: bobCommitTx,
CommitSig: bytes.Repeat([]byte{1}, 71), CommitSig: bytes.Repeat([]byte{1}, 71),
} }