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

sweeper_test: return unique wallet utxos

Browse Source 
We also increase the value of the wallet UTXO, as it is needed when we
want to afford fees for larger transactions.
This commit is contained in:
Johan T. Halseth 2020-11-09 18:49:44 +01:00
parent 0cba47dac0
commit 7f9df26efd
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sweep/backend_mock_test.go
View File

@ -27,6 +27,7 @@ type mockBackend struct {
publishChan chan wire.MsgTx publishChan chan wire.MsgTx
walletUtxos []*lnwallet.Utxo walletUtxos []*lnwallet.Utxo
utxoCnt int
} }
func newMockBackend(t *testing.T, notifier *MockNotifier) *mockBackend { func newMockBackend(t *testing.T, notifier *MockNotifier) *mockBackend {
@ -88,6 +89,16 @@ func (b *mockBackend) PublishTransaction(tx *wire.MsgTx, _ string) error {
func (b *mockBackend) ListUnspentWitness(minconfirms, maxconfirms int32) ( func (b *mockBackend) ListUnspentWitness(minconfirms, maxconfirms int32) (
[]*lnwallet.Utxo, error) { []*lnwallet.Utxo, error) {
b.lock.Lock()
defer b.lock.Unlock()
// Each time we list output, we increment the utxo counter, to
// ensure we don't return the same outpoint every time.
b.utxoCnt++
for i := range b.walletUtxos {
b.walletUtxos[i].OutPoint.Hash[0] = byte(b.utxoCnt)
}
return b.walletUtxos, nil return b.walletUtxos, nil
} }

13
sweep/sweeper_test.go
View File

@ -64,7 +64,7 @@ var (
func createTestInput(value int64, witnessType input.WitnessType) input.BaseInput { func createTestInput(value int64, witnessType input.WitnessType) input.BaseInput {
hash := chainhash.Hash{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, hash := chainhash.Hash{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
byte(testInputCount)} byte(testInputCount + 1)}
input := input.MakeBaseInput( input := input.MakeBaseInput(
&wire.OutPoint{ &wire.OutPoint{
@ -106,7 +106,7 @@ func createSweeperTestContext(t *testing.T) *sweeperTestContext {
backend := newMockBackend(t, notifier) backend := newMockBackend(t, notifier)
backend.walletUtxos = []*lnwallet.Utxo{ backend.walletUtxos = []*lnwallet.Utxo{
{ {
Value: btcutil.Amount(10000), Value: btcutil.Amount(1_000_000),
AddressType: lnwallet.WitnessPubKey, AddressType: lnwallet.WitnessPubKey,
}, },
} }
@ -493,8 +493,9 @@ func TestWalletUtxo(t *testing.T) {
"inputs instead", len(sweepTx.TxIn)) "inputs instead", len(sweepTx.TxIn))
} }
// Calculate expected output value based on wallet utxo of 10000 sats. // Calculate expected output value based on wallet utxo of 1_000_000
expectedOutputValue := int64(294 + 10000 - 180) // sats.
expectedOutputValue := int64(294 + 1_000_000 - 180)
if sweepTx.TxOut[0].Value != expectedOutputValue { if sweepTx.TxOut[0].Value != expectedOutputValue {
t.Fatalf("Expected output value of %v, but got %v", t.Fatalf("Expected output value of %v, but got %v",
expectedOutputValue, sweepTx.TxOut[0].Value) expectedOutputValue, sweepTx.TxOut[0].Value)
@ -1369,8 +1370,8 @@ func TestCpfp(t *testing.T) {
// package, making a total of 1059. At 5000 sat/kw, the required fee for // package, making a total of 1059. At 5000 sat/kw, the required fee for
// the package is 5295 sats. The parent already paid 900 sats, so there // the package is 5295 sats. The parent already paid 900 sats, so there
// is 4395 sat remaining to be paid. The expected output value is // is 4395 sat remaining to be paid. The expected output value is
// therefore: 10000 + 330 - 4395 = 5935. // therefore: 1_000_000 + 330 - 4395 = 995 935.
require.Equal(t, int64(5935), tx.TxOut[0].Value) require.Equal(t, int64(995_935), tx.TxOut[0].Value)
// Mine the tx and assert that the result is passed back. // Mine the tx and assert that the result is passed back.
ctx.backend.mine() ctx.backend.mine()