highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-07-12 22:22:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

lntest: Break lntest dependence on config in the main package.

Browse Source 
This creates a new nodeConfig struct for the node in the lntest
package in order to decouple lntest from the main package.
This commit is contained in:
Jim Posen
2017-11-03 14:06:07 -07:00
committed by Olaoluwa Osuntokun
parent fd4af6da8e
commit 3cb0705b8e
2 changed files with 102 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lntest/harness.go
View File

@ -45,18 +45,22 @@ func newNetworkHarness() (*networkHarness, error) {
// running instance of btcd's rpctest harness and extra command line flags,
// which should be formatted properly - "--arg=value".
func (n *networkHarness) InitializeSeedNodes(r *rpctest.Harness, lndArgs []string) error {
nodeConfig := r.RPCConfig()
n.netParams = r.ActiveNet
n.Miner = r
n.rpcConfig = nodeConfig
config := nodeConfig{
RPCConfig: &n.rpcConfig,
NetParams: n.netParams,
ExtraArgs: lndArgs,
}
var err error
n.Alice, err = newLightningNode(&nodeConfig, lndArgs)
n.Alice, err = newLightningNode(config)
if err != nil {
return err
}
n.Bob, err = newLightningNode(&nodeConfig, lndArgs)
n.Bob, err = newLightningNode(config)
if err != nil {
return err
}
@ -216,7 +220,11 @@ func (n *networkHarness) NewNode(extraArgs []string) (*lightningNode, error) {
n.Lock()
defer n.Unlock()
node, err := newLightningNode(&n.rpcConfig, extraArgs)
node, err := newLightningNode(nodeConfig{
RPCConfig: &n.rpcConfig,
NetParams: n.netParams,
ExtraArgs: extraArgs,
})
if err != nil {
return nil, err
}
@ -247,7 +255,7 @@ func (n *networkHarness) ConnectNodes(ctx context.Context, a, b *lightningNode)
req := &lnrpc.ConnectPeerRequest{
Addr: &lnrpc.LightningAddress{
Pubkey: bobInfo.IdentityPubkey,
Host: b.p2pAddr,
Host: b.cfg.P2PAddr(),
},
}
if _, err := a.ConnectPeer(ctx, req); err != nil {