diff --git a/lntest/harness.go b/lntest/harness.go index be57082d..1de4cb8b 100644 --- a/lntest/harness.go +++ b/lntest/harness.go @@ -22,6 +22,28 @@ import ( "github.com/lightningnetwork/lnd/lnwire" ) +const ( + // DefaultCSV is the CSV delay (remotedelay) we will start our test + // nodes with. + DefaultCSV = 4 + + // MinerMempoolTimeout is the max time we will wait for a transaction + // to propagate to the mining node's mempool. + MinerMempoolTimeout = time.Second * 30 + + // ChannelOpenTimeout is the max time we will wait before a channel to + // be considered opened. + ChannelOpenTimeout = time.Second * 30 + + // ChannelCloseTimeout is the max time we will wait before a channel is + // considered closed. + ChannelCloseTimeout = time.Second * 30 + + // DefaultTimeout is a timeout that will be used for various wait + // scenarios where no custom timeout value is defined. + DefaultTimeout = time.Second * 30 +) + // NetworkHarness is an integration testing harness for the lightning network. // The harness by default is created with two active nodes on the network: // Alice and Bob. diff --git a/lntest/node.go b/lntest/node.go index f73e2900..944d6216 100644 --- a/lntest/node.go +++ b/lntest/node.go @@ -148,7 +148,7 @@ func (cfg nodeConfig) genArgs() []string { args = append(args, "--nobootstrap") args = append(args, "--debuglevel=debug") args = append(args, "--bitcoin.defaultchanconfs=1") - args = append(args, "--bitcoin.defaultremotedelay=4") + args = append(args, fmt.Sprintf("--bitcoin.defaultremotedelay=%v", DefaultCSV)) args = append(args, fmt.Sprintf("--btcd.rpchost=%v", cfg.RPCConfig.Host)) args = append(args, fmt.Sprintf("--btcd.rpcuser=%v", cfg.RPCConfig.User)) args = append(args, fmt.Sprintf("--btcd.rpcpass=%v", cfg.RPCConfig.Pass))