From 7ecbb2debc168c2b30f28f81b9f6406c2bfd8b95 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Sat, 16 Jan 2016 19:05:13 -0800
Subject: [PATCH] move getPriv to server.go, and rename

---
 rpcserver.go | 14 --------------
 server.go    | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/rpcserver.go b/rpcserver.go
index c5e4fad6..245773c2 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -105,20 +105,6 @@ func (r *rpcServer) Stop() error {
 	return nil
 }
 
-// getPriv gets the identity private key out of the wallet DB
-func getPriv(l *lnwallet.LightningWallet) (*btcec.PrivateKey, error) {
-	adr, err := l.ChannelDB.GetIdAdr()
-	if err != nil {
-		return nil, err
-	}
-	fmt.Printf("got ID address: %s\n", adr.String())
-	adr2, err := l.Manager.Address(adr)
-	if err != nil {
-		return nil, err
-	}
-	priv, err := adr2.(waddrmgr.ManagedPubKeyAddress).PrivKey()
-	if err != nil {
-		return nil, err
 	}
 	fmt.Printf("got privkey %x\n", priv.Serialize()) // may want to remove this :)
 	return priv, nil
diff --git a/server.go b/server.go
index f3d80893..938eb0fb 100644
--- a/server.go
+++ b/server.go
@@ -132,3 +132,23 @@ func (s *server) Stop() error {
 	close(s.quit)
 	return nil
 }
+
+// getIdentityPrivKey gets the identity private key out of the wallet DB.
+func getIdentityPrivKey(l *lnwallet.LightningWallet) (*btcec.PrivateKey, error) {
+	adr, err := l.ChannelDB.GetIdAdr()
+	if err != nil {
+		return nil, err
+	}
+	fmt.Printf("got ID address: %s\n", adr.String())
+	adr2, err := l.Manager.Address(adr)
+	if err != nil {
+		return nil, err
+	}
+	fmt.Println("pubkey: %v", hex.EncodeToString(adr2.(waddrmgr.ManagedPubKeyAddress).PubKey().SerializeCompressed()))
+	priv, err := adr2.(waddrmgr.ManagedPubKeyAddress).PrivKey()
+	if err != nil {
+		return nil, err
+	}
+
+	return priv, nil
+}