lnwire: modify newAlias to no longer return an error

This commit is contained in:
Olaoluwa Osuntokun 2017-04-19 14:59:16 -07:00
parent 1b10db212e
commit 920fcf3392
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
3 changed files with 5 additions and 11 deletions

@ -747,10 +747,7 @@ func readElement(r io.Reader, element interface{}) error {
return err
}
*e, err = newAlias(a[:])
if err != nil {
return err
}
*e = newAlias(a[:])
default:
return fmt.Errorf("Unknown type in readElement: %T", e)
}

@ -31,12 +31,12 @@ type Alias struct {
}
// NewAlias create the alias from string and also checks spec requirements.
func NewAlias(s string) (Alias, error) {
func NewAlias(s string) Alias {
data := []byte(s)
return newAlias(data)
}
func newAlias(data []byte) (Alias, error) {
func newAlias(data []byte) Alias {
var a [32]byte
rawAlias := data
@ -54,7 +54,7 @@ func newAlias(data []byte) (Alias, error) {
return Alias{
data: a,
aliasLen: aliasEnd,
}, nil
}
}
func (a *Alias) String() string {

@ -190,10 +190,7 @@ func newServer(listenAddrs []string, notifier chainntnfs.ChainNotifier,
// In order to have ability to announce the self node we need to
// sign the node announce message, and include the signature in the
// node channeldb object.
alias, err := lnwire.NewAlias(hex.EncodeToString(serializedPubKey[:10]))
if err != nil {
return nil, fmt.Errorf("can't create alias: %v", err)
}
alias := lnwire.NewAlias(hex.EncodeToString(serializedPubKey[:10]))
self := &channeldb.LightningNode{
LastUpdate: time.Now(),
Addresses: selfAddrs,