core/identity.go

@@ -37,7 +37,6 @@ func CreateIdentity(core *Ricochet) (*Identity, error) {
 		log.Printf("Failed loading identity: %v", err)
 		return nil, err
 	}
-	log.Println("me: ", me)
 
 	contactList, err := LoadContactList(core)
 	if err != nil {
@@ -47,7 +46,6 @@ func CreateIdentity(core *Ricochet) (*Identity, error) {
 	me.contactList = contactList
 
 	contactList.StartConnections()
-	log.Println("me: ", me)
 	go me.publishService(me.privateKey)
 	return me, nil
 }
@@ -55,27 +53,22 @@ func CreateIdentity(core *Ricochet) (*Identity, error) {
 func (me *Identity) loadIdentity() error {
 	config := me.core.Config.Read()
 
-	keyData := config.Secrets.GetServicePrivateKey();
+	if keyData := config.Secrets.GetServicePrivateKey(); keyData != nil {
+		var err error
+		me.privateKey, _, err = pkcs1.DecodePrivateKeyDER(keyData)
+		if err != nil {
+			return err
+		}
+		me.address, err = AddressFromKey(&me.privateKey.PublicKey)
+		if err != nil {
+			return err
+		}
 
-	if keyData != nil {
+		log.Printf("Loaded identity %s", me.address)
+	} else {
 		log.Printf("Initializing new identity")
-
-		privateKey, err := utils.GeneratePrivateKey()
 	}
 
-	var err error
-	me.privateKey, _, err = pkcs1.DecodePrivateKeyDER(keyData)
-	if err != nil {
-		return err
-	}
-	me.address, err = AddressFromKey(&me.privateKey.PublicKey)
-	if err != nil {
-		return err
-	}
-
-	log.Printf("Loaded identity %s", me.address)
-
-
 	return nil
 }
 
@@ -112,7 +105,6 @@ func (me *Identity) setPrivateKey(key *rsa.PrivateKey) error {
 
 // BUG(special): No error handling for failures under publishService
 func (me *Identity) publishService(key *rsa.PrivateKey) {
-	log.Println("publishService(", key, ")")
 	// This call will block until a control connection is available and the
 	// ADD_ONION command has returned. After creating the listener, it will
 	// be automatically re-published if the control connection is lost and