From a28cf3fdf8e9243c92a8eb5a353f1d086ef642ce Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Fri, 12 Aug 2016 15:51:53 -0700
Subject: [PATCH] lnd: obtain the identity key via the wallet's GetIdentityKey
 method

---
 server.go | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/server.go b/server.go
index 4fab56c0..65420575 100644
--- a/server.go
+++ b/server.go
@@ -18,7 +18,6 @@ import (
 
 	"github.com/BitfuryLightning/tools/routing"
 	"github.com/BitfuryLightning/tools/rt/graph"
-	"github.com/roasbeef/btcwallet/waddrmgr"
 )
 
 // server is the main server of the Lightning Network Daemon. The server
@@ -66,7 +65,7 @@ type server struct {
 func newServer(listenAddrs []string, notifier chainntnfs.ChainNotifier,
 	wallet *lnwallet.LightningWallet, chanDB *channeldb.DB) (*server, error) {
 
-	privKey, err := getIdentityPrivKey(chanDB, wallet)
+	privKey, err := wallet.GetIdentitykey()
 	if err != nil {
 		return nil, err
 	}
@@ -493,33 +492,3 @@ func (s *server) listener(l net.Listener) {
 
 	s.wg.Done()
 }
-
-// getIdentityPrivKey gets the identity private key out of the wallet DB.
-func getIdentityPrivKey(c *channeldb.DB,
-	w *lnwallet.LightningWallet) (*btcec.PrivateKey, error) {
-
-	// First retrieve the current identity address for this peer.
-	adr, err := c.GetIdAdr()
-	if err != nil {
-		return nil, err
-	}
-
-	// Using the ID address, request the private key coresponding to the
-	// address from the wallet's address manager.
-	adr2, err := w.Manager.Address(adr)
-	if err != nil {
-		return nil, err
-	}
-
-	serializedKey := adr2.(waddrmgr.ManagedPubKeyAddress).PubKey().SerializeCompressed()
-	keyEncoded := hex.EncodeToString(serializedKey)
-	ltndLog.Infof("identity address: %v", adr)
-	ltndLog.Infof("identity pubkey retrieved: %v", keyEncoded)
-
-	priv, err := adr2.(waddrmgr.ManagedPubKeyAddress).PrivKey()
-	if err != nil {
-		return nil, err
-	}
-
-	return priv, nil
-}