diff --git a/cmd/chantools/chanbackup.go b/cmd/chantools/chanbackup.go index 552b5da..be395ed 100644 --- a/cmd/chantools/chanbackup.go +++ b/cmd/chantools/chanbackup.go @@ -30,7 +30,7 @@ func (c *chanBackupCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/derivekey.go b/cmd/chantools/derivekey.go index 8fe54e0..085771a 100644 --- a/cmd/chantools/derivekey.go +++ b/cmd/chantools/derivekey.go @@ -33,7 +33,7 @@ func (c *deriveKeyCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/dumpbackup.go b/cmd/chantools/dumpbackup.go index ce97b85..4cec607 100644 --- a/cmd/chantools/dumpbackup.go +++ b/cmd/chantools/dumpbackup.go @@ -30,7 +30,7 @@ func (c *dumpBackupCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/filterbackup.go b/cmd/chantools/filterbackup.go index 2771193..04636e3 100644 --- a/cmd/chantools/filterbackup.go +++ b/cmd/chantools/filterbackup.go @@ -32,7 +32,7 @@ func (c *filterBackupCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/fixoldbackup.go b/cmd/chantools/fixoldbackup.go index 1400041..8c47178 100644 --- a/cmd/chantools/fixoldbackup.go +++ b/cmd/chantools/fixoldbackup.go @@ -30,7 +30,7 @@ func (c *fixOldBackupCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/forceclose.go b/cmd/chantools/forceclose.go index 29301a9..66da467 100644 --- a/cmd/chantools/forceclose.go +++ b/cmd/chantools/forceclose.go @@ -39,7 +39,7 @@ func (c *forceCloseCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/genimportscript.go b/cmd/chantools/genimportscript.go index b3f7df8..833aa5e 100644 --- a/cmd/chantools/genimportscript.go +++ b/cmd/chantools/genimportscript.go @@ -44,7 +44,7 @@ func (c *genImportScriptCommand) Execute(_ []string) error { } default: - extendedKey, birthday, err = lnd.ReadAezeedFromTerminal( + extendedKey, birthday, err = lnd.ReadAezeed( chainParams, ) if err != nil { diff --git a/cmd/chantools/rescueclosed.go b/cmd/chantools/rescueclosed.go index dcb69b5..50e4973 100644 --- a/cmd/chantools/rescueclosed.go +++ b/cmd/chantools/rescueclosed.go @@ -50,7 +50,7 @@ func (c *rescueClosedCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/rescuefunding.go b/cmd/chantools/rescuefunding.go index 0a8867e..6611731 100644 --- a/cmd/chantools/rescuefunding.go +++ b/cmd/chantools/rescuefunding.go @@ -57,7 +57,7 @@ func (c *rescueFundingCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal( + extendedKey, _, err = lnd.ReadAezeed( chainParams, ) } diff --git a/cmd/chantools/showrootkey.go b/cmd/chantools/showrootkey.go index dacb3c3..e930276 100644 --- a/cmd/chantools/showrootkey.go +++ b/cmd/chantools/showrootkey.go @@ -26,7 +26,7 @@ func (c *showRootKeyCommand) Execute(_ []string) error { extendedKey, err = btc.ReadMnemonicFromTerminal(chainParams) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/signrescuefunding.go b/cmd/chantools/signrescuefunding.go index 53f7c76..7f1b4de 100644 --- a/cmd/chantools/signrescuefunding.go +++ b/cmd/chantools/signrescuefunding.go @@ -30,7 +30,7 @@ func (c *signRescueFundingCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/sweeptimelock.go b/cmd/chantools/sweeptimelock.go index a8e0b2c..b68bb1c 100644 --- a/cmd/chantools/sweeptimelock.go +++ b/cmd/chantools/sweeptimelock.go @@ -44,7 +44,7 @@ func (c *sweepTimeLockCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/cmd/chantools/sweeptimelockmanual.go b/cmd/chantools/sweeptimelockmanual.go index c5584fd..6c2ccf1 100644 --- a/cmd/chantools/sweeptimelockmanual.go +++ b/cmd/chantools/sweeptimelockmanual.go @@ -48,7 +48,7 @@ func (c *sweepTimeLockManualCommand) Execute(_ []string) error { extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey) default: - extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams) + extendedKey, _, err = lnd.ReadAezeed(chainParams) } if err != nil { return fmt.Errorf("error reading root key: %v", err) diff --git a/lnd/aezeed.go b/lnd/aezeed.go index 9ac9119..a80ec51 100644 --- a/lnd/aezeed.go +++ b/lnd/aezeed.go @@ -20,8 +20,8 @@ var ( multipleSpaces = regexp.MustCompile(" [ ]+") ) -func ReadAezeedFromTerminal(params *chaincfg.Params) (*hdkeychain.ExtendedKey, - time.Time, error) { +func ReadAezeed(params *chaincfg.Params) (*hdkeychain.ExtendedKey, time.Time, + error) { // We'll now prompt the user to enter in their 24-word mnemonic. fmt.Printf("Input your 24-word mnemonic separated by spaces: ")