tests: Modify to handle changes to WalletBalance response

This commit is contained in:
Nalin Bhardwaj 2017-11-26 18:47:57 +05:30
parent a234e01c07
commit eb13be9adf
No known key found for this signature in database
GPG Key ID: B25133FC2745D499
2 changed files with 6 additions and 6 deletions

View File

@ -1107,7 +1107,7 @@ func testChannelForceClosure(net *networkHarness, t *harnessTest) {
t.Fatalf("unable to get carol's balance: %v", err) t.Fatalf("unable to get carol's balance: %v", err)
} }
carolStartingBalance := btcutil.Amount(carolBalResp.Balance * 1e8) carolStartingBalance := btcutil.Amount(carolBalResp.ConfirmedBalance * 1e8)
ctxt, _ := context.WithTimeout(ctxb, timeout) ctxt, _ := context.WithTimeout(ctxb, timeout)
chanPoint := openChannelAndAssert(ctxt, t, net, net.Alice, carol, chanPoint := openChannelAndAssert(ctxt, t, net, net.Alice, carol,
@ -1707,10 +1707,10 @@ func testChannelForceClosure(net *networkHarness, t *harnessTest) {
t.Fatalf("unable to get carol's balance: %v", err) t.Fatalf("unable to get carol's balance: %v", err)
} }
carolExpectedBalance := carolStartingBalance + pushAmt carolExpectedBalance := carolStartingBalance + pushAmt
if btcutil.Amount(carolBalResp.Balance*1e8) < carolExpectedBalance { if btcutil.Amount(carolBalResp.ConfirmedBalance*1e8) < carolExpectedBalance {
t.Fatalf("carol's balance is incorrect: expected %v got %v", t.Fatalf("carol's balance is incorrect: expected %v got %v",
carolExpectedBalance, carolExpectedBalance,
btcutil.Amount(carolBalResp.Balance*1e8)) btcutil.Amount(carolBalResp.ConfirmedBalance*1e8))
} }
} }

View File

@ -868,8 +868,8 @@ out:
return err return err
} }
if aliceResp.Balance == expectedBalance && if aliceResp.ConfirmedBalance == expectedBalance &&
bobResp.Balance == expectedBalance { bobResp.ConfirmedBalance == expectedBalance {
break out break out
} }
case <-balanceTimeout: case <-balanceTimeout:
@ -1494,7 +1494,7 @@ func (n *networkHarness) SendCoins(ctx context.Context, amt btcutil.Amount,
return err return err
} }
if currentBal.Balance == initialBalance.Balance+int64(amt) { if currentBal.ConfirmedBalance == initialBalance.ConfirmedBalance+int64(amt) {
return nil return nil
} }
case <-balanceTimeout: case <-balanceTimeout: