test: ensure all tests adhere to maximum funding amount

This commit is contained in:
Olaoluwa Osuntokun 2017-08-07 16:30:29 -07:00
parent 203d038b71
commit f13c81eb6a
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
2 changed files with 13 additions and 13 deletions

@ -37,7 +37,7 @@ const (
// real world. // real world.
// //
// TODO(roasbeef): add command line param to modify // TODO(roasbeef): add command line param to modify
maxFundingAmount = btcutil.Amount(2 << 24) maxFundingAmount = btcutil.Amount(1 << 24)
) )
// reservationWithCtx encapsulates a pending channel reservation. This wrapper // reservationWithCtx encapsulates a pending channel reservation. This wrapper

@ -315,7 +315,7 @@ func testBasicChannelFunding(net *networkHarness, t *harnessTest) {
timeout := time.Duration(time.Second * 5) timeout := time.Duration(time.Second * 5)
ctxb := context.Background() ctxb := context.Background()
chanAmt := btcutil.Amount(btcutil.SatoshiPerBitcoin / 2) chanAmt := maxFundingAmount
pushAmt := btcutil.Amount(100000) pushAmt := btcutil.Amount(100000)
// First establish a channel with a capacity of 0.5 BTC between Alice // First establish a channel with a capacity of 0.5 BTC between Alice
@ -370,7 +370,7 @@ func testDisconnectingTargetPeer(net *networkHarness, t *harnessTest) {
// Check existing connection. // Check existing connection.
assertNumConnections(ctxb, t, net.Alice, net.Bob, 1) assertNumConnections(ctxb, t, net.Alice, net.Bob, 1)
chanAmt := btcutil.Amount(btcutil.SatoshiPerBitcoin / 2) chanAmt := maxFundingAmount
pushAmt := btcutil.Amount(0) pushAmt := btcutil.Amount(0)
timeout := time.Duration(time.Second * 10) timeout := time.Duration(time.Second * 10)
@ -487,7 +487,7 @@ func testDisconnectingTargetPeer(net *networkHarness, t *harnessTest) {
func testChannelFundingPersistence(net *networkHarness, t *harnessTest) { func testChannelFundingPersistence(net *networkHarness, t *harnessTest) {
ctxb := context.Background() ctxb := context.Background()
chanAmt := btcutil.Amount(btcutil.SatoshiPerBitcoin / 2) chanAmt := maxFundingAmount
pushAmt := btcutil.Amount(0) pushAmt := btcutil.Amount(0)
timeout := time.Duration(time.Second * 10) timeout := time.Duration(time.Second * 10)
@ -632,9 +632,9 @@ peersPoll:
func testChannelBalance(net *networkHarness, t *harnessTest) { func testChannelBalance(net *networkHarness, t *harnessTest) {
timeout := time.Duration(time.Second * 5) timeout := time.Duration(time.Second * 5)
// Open a channel with 0.5 BTC between Alice and Bob, ensuring the // Open a channel with 0.16 BTC between Alice and Bob, ensuring the
// channel has been opened properly. // channel has been opened properly.
amount := btcutil.Amount(btcutil.SatoshiPerBitcoin / 2) amount := maxFundingAmount
ctx, _ := context.WithTimeout(context.Background(), timeout) ctx, _ := context.WithTimeout(context.Background(), timeout)
// Creates a helper closure to be used below which asserts the proper // Creates a helper closure to be used below which asserts the proper
@ -1528,7 +1528,7 @@ func testBasicChannelCreation(net *networkHarness, t *harnessTest) {
const ( const (
numChannels = 2 numChannels = 2
timeout = time.Duration(time.Second * 5) timeout = time.Duration(time.Second * 5)
amount = btcutil.Amount(btcutil.SatoshiPerBitcoin) amount = maxFundingAmount
) )
// Open the channel between Alice and Bob, asserting that the // Open the channel between Alice and Bob, asserting that the
@ -1553,7 +1553,7 @@ func testBasicChannelCreation(net *networkHarness, t *harnessTest) {
// exists and works properly. // exists and works properly.
func testMaxPendingChannels(net *networkHarness, t *harnessTest) { func testMaxPendingChannels(net *networkHarness, t *harnessTest) {
maxPendingChannels := defaultMaxPendingChannels + 1 maxPendingChannels := defaultMaxPendingChannels + 1
amount := btcutil.Amount(btcutil.SatoshiPerBitcoin) amount := maxFundingAmount
timeout := time.Duration(time.Second * 10) timeout := time.Duration(time.Second * 10)
ctx, _ := context.WithTimeout(context.Background(), timeout) ctx, _ := context.WithTimeout(context.Background(), timeout)
@ -1688,7 +1688,7 @@ func testRevokedCloseRetribution(net *networkHarness, t *harnessTest) {
ctxb := context.Background() ctxb := context.Background()
const ( const (
timeout = time.Duration(time.Second * 5) timeout = time.Duration(time.Second * 5)
chanAmt = btcutil.Amount(btcutil.SatoshiPerBitcoin / 2) chanAmt = maxFundingAmount
paymentAmt = 10000 paymentAmt = 10000
numInvoices = 6 numInvoices = 6
) )
@ -1922,7 +1922,7 @@ func testHtlcErrorPropagation(net *networkHarness, t *harnessTest) {
timeout := time.Duration(time.Second * 5) timeout := time.Duration(time.Second * 5)
ctxb := context.Background() ctxb := context.Background()
const chanAmt = btcutil.Amount(btcutil.SatoshiPerBitcoin / 2) const chanAmt = maxFundingAmount
// First establish a channel with a capacity of 0.5 BTC between Alice // First establish a channel with a capacity of 0.5 BTC between Alice
// and Bob. // and Bob.
@ -1970,7 +1970,7 @@ func testHtlcErrorPropagation(net *networkHarness, t *harnessTest) {
t.Fatalf("unable to connect bob to carol: %v", err) t.Fatalf("unable to connect bob to carol: %v", err)
} }
ctxt, _ = context.WithTimeout(ctxb, timeout) ctxt, _ = context.WithTimeout(ctxb, timeout)
const bobChanAmt = btcutil.Amount(btcutil.SatoshiPerBitcoin / 2) const bobChanAmt = maxFundingAmount
chanPointBob := openChannelAndAssert(ctxt, t, net, net.Bob, carol, chanPointBob := openChannelAndAssert(ctxt, t, net, net.Bob, carol,
chanAmt, 0) chanAmt, 0)
@ -2201,7 +2201,7 @@ out:
} }
func testGraphTopologyNotifications(net *networkHarness, t *harnessTest) { func testGraphTopologyNotifications(net *networkHarness, t *harnessTest) {
const chanAmt = btcutil.Amount(btcutil.SatoshiPerBitcoin / 2) const chanAmt = maxFundingAmount
timeout := time.Duration(time.Second * 5) timeout := time.Duration(time.Second * 5)
ctxb := context.Background() ctxb := context.Background()
@ -2510,7 +2510,7 @@ func testNodeSignVerify(net *networkHarness, t *harnessTest) {
timeout := time.Duration(time.Second * 5) timeout := time.Duration(time.Second * 5)
ctxb := context.Background() ctxb := context.Background()
chanAmt := btcutil.Amount(btcutil.SatoshiPerBitcoin / 2) chanAmt := maxFundingAmount
pushAmt := btcutil.Amount(100000) pushAmt := btcutil.Amount(100000)
// Create a channel between alice and bob. // Create a channel between alice and bob.