multi: rename ReadAezeedFromTerminal to ReadAezeed

guggero · guggero · commit c79796564845 · 2020-10-29T19:46:41.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: ")

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func (c *chanBackupCommand) Execute(_ []string) error {`
`30`	`30`	`extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)`
`31`	`31`
`32`	`32`	`default:`
`33`		`- extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)`
	`33`	`+ extendedKey, _, err = lnd.ReadAezeed(chainParams)`
`34`	`34`	`}`
`35`	`35`	`if err != nil {`
`36`	`36`	`return fmt.Errorf("error reading root key: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func (c *deriveKeyCommand) Execute(_ []string) error {`
`33`	`33`	`extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)`
`34`	`34`
`35`	`35`	`default:`
`36`		`- extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)`
	`36`	`+ extendedKey, _, err = lnd.ReadAezeed(chainParams)`
`37`	`37`	`}`
`38`	`38`	`if err != nil {`
`39`	`39`	`return fmt.Errorf("error reading root key: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func (c *dumpBackupCommand) Execute(_ []string) error {`
`30`	`30`	`extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)`
`31`	`31`
`32`	`32`	`default:`
`33`		`- extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)`
	`33`	`+ extendedKey, _, err = lnd.ReadAezeed(chainParams)`
`34`	`34`	`}`
`35`	`35`	`if err != nil {`
`36`	`36`	`return fmt.Errorf("error reading root key: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (c *filterBackupCommand) Execute(_ []string) error {`
`32`	`32`	`extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)`
`33`	`33`
`34`	`34`	`default:`
`35`		`- extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)`
	`35`	`+ extendedKey, _, err = lnd.ReadAezeed(chainParams)`
`36`	`36`	`}`
`37`	`37`	`if err != nil {`
`38`	`38`	`return fmt.Errorf("error reading root key: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func (c *fixOldBackupCommand) Execute(_ []string) error {`
`30`	`30`	`extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)`
`31`	`31`
`32`	`32`	`default:`
`33`		`- extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)`
	`33`	`+ extendedKey, _, err = lnd.ReadAezeed(chainParams)`
`34`	`34`	`}`
`35`	`35`	`if err != nil {`
`36`	`36`	`return fmt.Errorf("error reading root key: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func (c *forceCloseCommand) Execute(_ []string) error {`
`39`	`39`	`extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)`
`40`	`40`
`41`	`41`	`default:`
`42`		`- extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)`
	`42`	`+ extendedKey, _, err = lnd.ReadAezeed(chainParams)`
`43`	`43`	`}`
`44`	`44`	`if err != nil {`
`45`	`45`	`return fmt.Errorf("error reading root key: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (c *genImportScriptCommand) Execute(_ []string) error {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`default:`
`47`		`- extendedKey, birthday, err = lnd.ReadAezeedFromTerminal(`
	`47`	`+ extendedKey, birthday, err = lnd.ReadAezeed(`
`48`	`48`	`chainParams,`
`49`	`49`	`)`
`50`	`50`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func (c *rescueClosedCommand) Execute(_ []string) error {`
`50`	`50`	`extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)`
`51`	`51`
`52`	`52`	`default:`
`53`		`- extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)`
	`53`	`+ extendedKey, _, err = lnd.ReadAezeed(chainParams)`
`54`	`54`	`}`
`55`	`55`	`if err != nil {`
`56`	`56`	`return fmt.Errorf("error reading root key: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func (c *rescueFundingCommand) Execute(_ []string) error {`
`57`	`57`	`extendedKey, err = hdkeychain.NewKeyFromString(c.RootKey)`
`58`	`58`
`59`	`59`	`default:`
`60`		`- extendedKey, _, err = lnd.ReadAezeedFromTerminal(`
	`60`	`+ extendedKey, _, err = lnd.ReadAezeed(`
`61`	`61`	`chainParams,`
`62`	`62`	`)`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func (c *showRootKeyCommand) Execute(_ []string) error {`
`26`	`26`	`extendedKey, err = btc.ReadMnemonicFromTerminal(chainParams)`
`27`	`27`
`28`	`28`	`default:`
`29`		`- extendedKey, _, err = lnd.ReadAezeedFromTerminal(chainParams)`
	`29`	`+ extendedKey, _, err = lnd.ReadAezeed(chainParams)`
`30`	`30`	`}`
`31`	`31`	`if err != nil {`
`32`	`32`	`return fmt.Errorf("error reading root key: %v", err)`