app/app.go

@@ -178,6 +178,9 @@ func (ac *applicationCore) LoadProfiles(password string, timeline bool, loadProf
 			legacyProfile := profileStore.GetProfileCopy(timeline)
 
 			cps, err := peer.CreateEncryptedStore(profileDirectory, password)
+			if err != nil {
+				log.Errorf("error creating encrypted store: %v", err)
+			}
 			profile := peer.ImportLegacyProfile(legacyProfile, cps)
 			loadProfileFn(profile)
 		}

functionality/filesharing/filesharing_functionality.go

@@ -23,7 +23,7 @@ type Functionality struct {
 
 // FunctionalityGate returns contact.Functionality always
 func FunctionalityGate(experimentMap map[string]bool) (*Functionality, error) {
-	if experimentMap["filesharing"] == true {
+	if experimentMap["filesharing"] {
 		return new(Functionality), nil
 	}
 	return nil, errors.New("filesharing is not enabled")

model/conversation.go

@@ -44,7 +44,7 @@ func (a *Attributes) Serialize() []byte {
 	return data
 }
 
-// DeserializeAttributes convers a JSON struct into an Attributes map
+// DeserializeAttributes converts a JSON struct into an Attributes map
 func DeserializeAttributes(data []byte) Attributes {
 	var attributes Attributes
 	json.Unmarshal(data, &attributes)
@@ -62,6 +62,7 @@ type Conversation struct {
 	Accepted   bool
 }
 
+// GetAttribute is a helper function that fetches a conversation attribute by scope, zone and key
 func (ci *Conversation) GetAttribute(scope attr.Scope, zone attr.Zone, key string) (string, bool) {
 	if value, exists := ci.Attributes[scope.ConstructScopedZonedPath(zone.ConstructZonedPath(key)).ToString()]; exists {
 		return value, true
@@ -69,6 +70,7 @@ func (ci *Conversation) GetAttribute(scope attr.Scope, zone attr.Zone, key strin
 	return "", false
 }
 
+// IsGroup is a helper attribute that identifies whether a conversation is a legacy group
 func (ci *Conversation) IsGroup() bool {
 	if _, exists := ci.Attributes[attr.LocalScope.ConstructScopedZonedPath(attr.LegacyGroupZone.ConstructZonedPath(constants.GroupID)).ToString()]; exists {
 		return true
@@ -76,6 +78,7 @@ func (ci *Conversation) IsGroup() bool {
 	return false
 }
 
+// IsServer is a helper attribute that identifies whether a conversation is with a server
 func (ci *Conversation) IsServer() bool {
 	if _, exists := ci.Attributes[attr.PublicScope.ConstructScopedZonedPath(attr.ServerKeyZone.ConstructZonedPath(string(BundleType))).ToString()]; exists {
 		return true
@@ -83,6 +86,7 @@ func (ci *Conversation) IsServer() bool {
 	return false
 }
 
+// ConversationMessage bundles an instance of a conversation message row
 type ConversationMessage struct {
 	ID          int
 	Body        string

peer/cwtch_peer.go

@@ -151,7 +151,7 @@ func (cp *cwtchPeer) SendMessage(conversation int, message string) error {
 
 	// We assume we are sending to a Contact.
 	conversationInfo, err := cp.storage.GetConversation(conversation)
-	// If the contact exists replace the event id wih the index of this message in the contacts timeline...
+	// If the contact exists replace the event id with the index of this message in the contacts timeline...
 	// Otherwise assume we don't log the message in the timeline...
 	if conversationInfo != nil && err == nil {
 
@@ -854,25 +854,27 @@ func (cp *cwtchPeer) Listen() {
 // StartPeersConnections attempts to connect to peer connections
 // Status: Ready for 1.5
 func (cp *cwtchPeer) StartPeersConnections() {
-	//for _, contact := range cp.GetContacts() {
-	//	if !cp.GetContact(contact).IsServer() {
-	//		cp.PeerWithOnion(contact)
-	//	}
-	//}
+	conversations, _ := cp.FetchConversations()
+	for _, conversation := range conversations {
+		if conversation.Accepted && !conversation.IsGroup() && !conversation.IsServer() {
+			cp.PeerWithOnion(conversation.Handle)
+		}
+	}
 }
 
 // StartServerConnections attempts to connect to all server connections
 // Status: Ready for 1.5
 func (cp *cwtchPeer) StartServerConnections() {
-	//for _, contact := range cp.GetContacts() {
-	//	if cp.GetContact(contact).IsServer() {
-	//		err := cp.JoinServer(contact)
-	//		if err != nil {
-	//			// Almost certainly a programming error so print it..
-	//			log.Errorf("error joining server %v", err)
-	//		}
-	//	}
-	//}
+	conversations, _ := cp.FetchConversations()
+	for _, conversation := range conversations {
+		if conversation.IsServer() {
+			err := cp.JoinServer(conversation.Handle)
+			if err != nil {
+				// Almost certainly a programming error so print it..
+				log.Errorf("error joining server %v", err)
+			}
+		}
+	}
 }
 
 // Shutdown kills all connections and cleans up all goroutines for the peer
@@ -889,7 +891,7 @@ func (cp *cwtchPeer) Shutdown() {
 
 // Status: TODO
 func (cp *cwtchPeer) storeMessage(handle string, message string, sent time.Time) error {
-	// TOOD maybe atomize this?
+	// TODO maybe atomize this?
 	ci, err := cp.FetchConversationInfo(handle)
 	if err != nil {
 		id, err := cp.NewContactConversation(handle, model.DefaultP2PAccessControl(), false)
@@ -943,7 +945,7 @@ func (cp *cwtchPeer) eventHandler() {
 			conversations, err := cp.FetchConversations()
 			if err == nil {
 				for _, conversationInfo := range conversations {
-					if tor.IsValidHostname(conversationInfo.Handle) == false {
+					if !tor.IsValidHostname(conversationInfo.Handle) {
 						group, err := cp.constructGroupFromConversation(conversationInfo)
 						if err == nil {
 							success, dgm := group.AttemptDecryption(ciphertext, signature)

peer/cwtchprofilestorage.go

@@ -83,17 +83,17 @@ const updateMessageIntoConversationSQLStmt = `update channel_%d_%d_chat set Attr
 // getMessageFromConversationSQLStmt is a template for fetching a message by ID from a conversation
 const getMessageFromConversationSQLStmt = `select Body, Attributes from channel_%d_%d_chat where ID=(?);`
 
-// getMessageBySignatureFromConversationSQLStmt is a template for creating conversation based tables...
+// getMessageBySignatureFromConversationSQLStmt is a template for selecting conversation messages by signature
 const getMessageBySignatureFromConversationSQLStmt = `select ID from channel_%d_%d_chat where Signature=(?);`
 
-// getMessageByContentHashFromConversationSQLStmt is a template for creating conversation based tables...
+// getMessageByContentHashFromConversationSQLStmt is a template for selecting conversation messages by content hash
 const getMessageByContentHashFromConversationSQLStmt = `select ID from channel_%d_%d_chat where ContentHash=(?);`
 
-// getMessageCountFromConversationSqlStmt
-const getMessageCountFromConversationSqlStmt = `select count(*) from channel_%d_%d_chat;`
+// getMessageCountFromConversationSQLStmt is a template for fetching the count of a messages  in a conversation channel
+const getMessageCountFromConversationSQLStmt = `select count(*) from channel_%d_%d_chat;`
 
-// getMostRecentMessagesFromSqlStmt
-const getMostRecentMessagesSqlStmt = `select ID, Body, Attributes, Signature, ContentHash from channel_%d_%d_chat order by ID desc limit (?) offset (?);`
+// getMostRecentMessagesSQLStmt is a template for fetching the most recent N messages in a conversation channel
+const getMostRecentMessagesSQLStmt = `select ID, Body, Attributes, Signature, ContentHash from channel_%d_%d_chat order by ID desc limit (?) offset (?);`
 
 // NewCwtchProfileStorage constructs a new CwtchProfileStorage from a database. It is also responsible for
 // Preparing commonly used SQL Statements
@@ -536,7 +536,7 @@ func (cps *CwtchProfileStorage) GetChannelMessageCount(conversation int, channel
 
 	_, exists := cps.channelGetCountStmts[channelID]
 	if !exists {
-		conversationStmt, err := cps.db.Prepare(fmt.Sprintf(getMessageCountFromConversationSqlStmt, conversation, channel))
+		conversationStmt, err := cps.db.Prepare(fmt.Sprintf(getMessageCountFromConversationSQLStmt, conversation, channel))
 		if err != nil {
 			log.Errorf("error executing transaction: %v", err)
 			return -1, err
@@ -553,13 +553,13 @@ func (cps *CwtchProfileStorage) GetChannelMessageCount(conversation int, channel
 	return count, nil
 }
 
-// GetChannelMessageCount returns the number of messages in a channel
+// GetMostRecentMessages returns the most recent messages in a channel up to a given limit at a given offset
 func (cps *CwtchProfileStorage) GetMostRecentMessages(conversation int, channel int, offset int, limit int) ([]model.ConversationMessage, error) {
 	channelID := ChannelID{Conversation: conversation, Channel: channel}
 
 	_, exists := cps.channelGetMostRecentMessagesStmts[channelID]
 	if !exists {
-		conversationStmt, err := cps.db.Prepare(fmt.Sprintf(getMostRecentMessagesSqlStmt, conversation, channel))
+		conversationStmt, err := cps.db.Prepare(fmt.Sprintf(getMostRecentMessagesSQLStmt, conversation, channel))
 		if err != nil {
 			log.Errorf("error executing transaction: %v", err)
 			return nil, err

protocol/connections/engine.go

@@ -140,7 +140,7 @@ func (e *engine) eventHandler() {
 		case event.InvitePeerToGroup:
 			err := e.sendPeerMessage(ev.Data[event.RemotePeer], pmodel.PeerMessage{ID: ev.EventID, Context: event.ContextInvite, Data: []byte(ev.Data[event.GroupInvite])})
 			if err != nil {
-
+				e.eventManager.Publish(event.NewEvent(event.SendMessageToPeerError, map[event.Field]string{event.RemotePeer: ev.Data[event.RemotePeer], event.EventID: ev.EventID, event.Error: "peer is offline or the connection has yet to finalize"}))
 			}
 		case event.JoinServer:
 			signature, err := base64.StdEncoding.DecodeString(ev.Data[event.Signature])
@@ -403,13 +403,6 @@ func (e *engine) serverConnecting(onion string) {
 	}))
 }
 
-func (e *engine) serverConnected(onion string) {
-	e.eventManager.Publish(event.NewEvent(event.ServerStateChange, map[event.Field]string{
-		event.GroupServer:     onion,
-		event.ConnectionState: ConnectionStateName[CONNECTED],
-	}))
-}
-
 func (e *engine) serverAuthed(onion string) {
 	e.eventManager.Publish(event.NewEvent(event.ServerStateChange, map[event.Field]string{
 		event.GroupServer:     onion,

protocol/connections/tokenboardclientapp.go

@@ -185,7 +185,7 @@ func (ta *TokenBoardClient) MakePayment() error {
 	log.Debugf("Waiting for successful PoW Auth...")
 
 	connected, err := client.Connect(ta.tokenServiceOnion, powTokenApp)
-	if connected == true && err == nil {
+	if connected && err == nil {
 		log.Debugf("Waiting for successful Token Acquisition...")
 		conn, err := client.WaitForCapabilityOrClose(ta.tokenServiceOnion, applications.HasTokensCapability)
 		if err == nil {

protocol/files/manifest.go

@@ -201,7 +201,7 @@ func (m *Manifest) StoreChunk(id uint64, contents []byte) (uint64, error) {
 	// Write the contents of the chunk to the file
 	_, err = m.openFd.Write(contents)
 
-	if err == nil && m.chunkComplete[id] == false {
+	if err == nil && !m.chunkComplete[id] {
 		m.chunkComplete[id] = true
 		m.progress++
 	}

protocol/files/manifest_test.go

@@ -29,16 +29,16 @@ func TestManifest(t *testing.T) {
 	t.Logf("%v", manifest)
 
 	// Try to tread the chunk
-	contents, err := manifest.GetChunkBytes(1)
+	_, err = manifest.GetChunkBytes(1)
 	if err == nil {
 		t.Fatalf("chunk fetch should have thrown an error")
 	}
 
-	contents, err = manifest.GetChunkBytes(0)
+	_, err = manifest.GetChunkBytes(0)
 	if err != nil {
 		t.Fatalf("chunk fetch error: %v", err)
 	}
-	contents, err = manifest.GetChunkBytes(0)
+	_, err = manifest.GetChunkBytes(0)
 	if err != nil {
 		t.Fatalf("chunk fetch error: %v", err)
 	}
@@ -46,7 +46,6 @@ func TestManifest(t *testing.T) {
 	json, _ := json.Marshal(manifest)
 	t.Logf("%s", json)
 
-	t.Logf("%s", contents)
 }
 
 func TestManifestLarge(t *testing.T) {

storage/profile_store.go

@@ -6,10 +6,6 @@ import (
 	"cwtch.im/cwtch/storage/v1"
 )
 
-const profileFilename = "profile"
-const versionFile = "VERSION"
-const currentVersion = 1
-
 // ProfileStore is an interface to managing the storage of Cwtch Profiles
 type ProfileStore interface {
 	GetProfileCopy(timeline bool) *model.Profile

storage/v1/file_enc.go

@@ -56,7 +56,7 @@ func DecryptFile(ciphertext []byte, key [32]byte) ([]byte, error) {
 	if ok {
 		return decrypted, nil
 	}
-	return nil, errors.New("Failed to decrypt")
+	return nil, errors.New("failed to decrypt")
 }
 
 // ReadEncryptedFile reads data from an encrypted file in directory with key

testing/cwtch_peer_server_integration_test.go

@@ -50,9 +50,7 @@ func waitForConnection(t *testing.T, peer peer.CwtchPeer, addr string, target co
 			fmt.Printf("peer %v  %v CONNECTED to %v\n", peerName, peer.GetOnion(), addr)
 			break
 		}
-		time.Sleep(time.Second * 2)
 	}
-	return
 }
 
 func TestCwtchPeerIntegration(t *testing.T) {

testing/encryptedstorage/encrypted_storage_integration_test.go

@@ -81,7 +81,7 @@ func TestEncryptedStorage(t *testing.T) {
 	if err != nil {
 		t.Fatalf("alice should have been able to fetch her own message")
 	}
-	_, attr, err := alice.GetChannelMessage(2, 0, 1)
+	_, attr, _ := alice.GetChannelMessage(2, 0, 1)
 	if attr[constants.AttrAck] != "false" {
 		t.Fatalf("Alices message should have been acknowledged...yet")
 	}

testing/filesharing/file_sharing_integration_test.go

@@ -48,7 +48,6 @@ func waitForPeerPeerConnection(t *testing.T, peera peer.CwtchPeer, peerb peer.Cw
 			break
 		}
 	}
-	return
 }
 
 func TestFileSharing(t *testing.T) {
@@ -156,7 +155,7 @@ func TestFileSharing(t *testing.T) {
 		t.Fatalf("Expected file download event")
 	}
 
-	manifest, err := files.CreateManifest("cwtch.out.png")
+	manifest, _ := files.CreateManifest("cwtch.out.png")
 	if hex.EncodeToString(manifest.RootHash) != "8f0ed73bbb30db45b6a740b1251cae02945f48e4f991464d5f3607685c45dcd136a325dab2e5f6429ce2b715e602b20b5b16bf7438fb6235fefe912adcedb5fd" {
 		t.Fatalf("file hash does not match expected %x: ", manifest.RootHash)
 	}

testing/quality.sh

@@ -9,7 +9,7 @@ go list ./... | xargs go vet
 echo ""
 echo "Linting:"
 
-go list ./... | xargs golint
+staticcheck ./...
 
 
 echo "Time to format"
@@ -21,4 +21,4 @@ ineffassign .
 
 # misspell (https://github.com/client9/misspell/cmd/misspell)
 echo "Checking for misspelled words..."
-misspell . | grep -v "vendor/" | grep -v "go.sum" | grep -v ".idea"
+misspell . | grep -v "testing/" | grep -v "vendor/" | grep -v "go.sum" | grep -v ".idea"