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

lntest: extend the restore/restart methods to also accept optional SCBs

Browse Source 
In this commit, we modify the `RestoreNodeWithSeed` and `RestartNode`
methods to also accept an SCB. This will be useful in new integration
tests to properly exercise the various restore/restart scenarios using
static channel backups.
This commit is contained in:
Olaoluwa Osuntokun 2019-03-11 16:18:10 -07:00
parent b8cbe3a1f8
commit b451536483
No known key found for this signature in database
GPG Key ID: CE58F7F8E20FD9A2
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lntest/harness.go
View File

@ -301,12 +301,13 @@ func (n *NetworkHarness) NewNodeWithSeed(name string, extraArgs []string,
} }
// RestoreNodeWithSeed fully initializes a HarnessNode using a chosen mnemonic, // RestoreNodeWithSeed fully initializes a HarnessNode using a chosen mnemonic,
// password, and recovery window. After providing the initialization request to // password, recovery window, and optionally a set of static channel backups.
// unlock the node, this method will finish initializing the LightningClient // After providing the initialization request to unlock the node, this method
// such that the HarnessNode can be used for regular rpc operations. // will finish initializing the LightningClient such that the HarnessNode can
// be used for regular rpc operations.
func (n *NetworkHarness) RestoreNodeWithSeed(name string, extraArgs []string, func (n *NetworkHarness) RestoreNodeWithSeed(name string, extraArgs []string,
password []byte, mnemonic []string, password []byte, mnemonic []string, recoveryWindow int32,
recoveryWindow int32) (*HarnessNode, error) { chanBackups *lnrpc.ChanBackupSnapshot) (*HarnessNode, error) {
node, err := n.newNode(name, extraArgs, true, password) node, err := n.newNode(name, extraArgs, true, password)
if err != nil { if err != nil {
@ -318,6 +319,7 @@ func (n *NetworkHarness) RestoreNodeWithSeed(name string, extraArgs []string,
CipherSeedMnemonic: mnemonic, CipherSeedMnemonic: mnemonic,
AezeedPassphrase: password, AezeedPassphrase: password,
RecoveryWindow: recoveryWindow, RecoveryWindow: recoveryWindow,
ChannelBackups: chanBackups,
} }
err = node.Init(context.Background(), initReq) err = node.Init(context.Background(), initReq)
@ -575,9 +577,11 @@ func (n *NetworkHarness) DisconnectNodes(ctx context.Context, a, b *HarnessNode)
// //
// This method can be useful when testing edge cases such as a node broadcast // This method can be useful when testing edge cases such as a node broadcast
// and invalidated prior state, or persistent state recovery, simulating node // and invalidated prior state, or persistent state recovery, simulating node
// crashes, etc. // crashes, etc. Additionally, each time the node is restarted, the caller can
func (n *NetworkHarness) RestartNode(node *HarnessNode, // pass a set of SCBs to pass in via the Unlock method allowing them to restore
callback func() error) error { // channels during restart.
func (n *NetworkHarness) RestartNode(node *HarnessNode, callback func() error,
chanBackups ...*lnrpc.ChanBackupSnapshot) error {
if err := node.stop(); err != nil { if err := node.stop(); err != nil {
return err return err
@ -601,7 +605,15 @@ func (n *NetworkHarness) RestartNode(node *HarnessNode,
// Otherwise, we'll unlock the wallet, then complete the final steps // Otherwise, we'll unlock the wallet, then complete the final steps
// for the node initialization process. // for the node initialization process.
return node.Unlock(context.Background(), node.cfg.Password) unlockReq := &lnrpc.UnlockWalletRequest{
WalletPassword: node.cfg.Password,
}
if len(chanBackups) != 0 {
unlockReq.ChannelBackups = chanBackups[0]
unlockReq.RecoveryWindow = 1000
}
return node.Unlock(context.Background(), unlockReq)
} }
// SuspendNode stops the given node and returns a callback that can be used to // SuspendNode stops the given node and returns a callback that can be used to