From f16cd86e202b0952c116fc00ce9532c3ac1f49bc Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Wed, 27 Jun 2018 09:19:38 -0700
Subject: [PATCH] fixing linting errors

---
 peer/cwtch_peer.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go
index d84cc2c..6101b60 100644
--- a/peer/cwtch_peer.go
+++ b/peer/cwtch_peer.go
@@ -108,7 +108,7 @@ func encryptProfile(p *cwtchPeer, key [32]byte) []byte {
 }
 
 //decryptProfile decrypts the passed ciphertext into a cwtchPeer via the specified key.
-func decryptProfile(ciphertext []byte, key [32]byte) (error, *cwtchPeer) {
+func decryptProfile(ciphertext []byte, key [32]byte) (*cwtchPeer, error) {
 
 	var decryptNonce [24]byte
 	copy(decryptNonce[:], ciphertext[:24])
@@ -117,12 +117,11 @@ func decryptProfile(ciphertext []byte, key [32]byte) (error, *cwtchPeer) {
 		cp := &cwtchPeer{}
 		err := json.Unmarshal(decrypted, &cp)
 		if err == nil {
-			return nil, cp
-		} else {
-			return err, nil
+			return cp, nil
 		}
+		return nil, err
 	}
-	return fmt.Errorf("Failed to decrypt"), nil
+	return nil, fmt.Errorf("Failed to decrypt")
 }
 
 func (cp *cwtchPeer) setup() {
@@ -184,16 +183,15 @@ func LoadCwtchPeer(profilefile string, password string) (CwtchPeerInterface, err
 	copy(dkr[:], dk)
 	copy(salty[:], salt)
 
-	err, cp := decryptProfile(encryptedbytes, dkr)
+	cp, err := decryptProfile(encryptedbytes, dkr)
 	if err == nil {
 		cp.setup()
 		cp.profilefile = profilefile
 		cp.key = dkr
 		cp.salt = salty
 		return cp, nil
-	} else {
-		return nil, err
 	}
+	return nil, err
 }
 
 // ImportGroup intializes a group from an imported source rather than a peer invite