fix: review fixes

status-im · Nov 7, 2023 · d7f3d9d · d7f3d9d
1 parent 8b359bd
commit d7f3d9d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/protocol/identity_images.go b/protocol/identity_images.go
@@ -9,7 +9,7 @@ import (
 	"github.com/status-im/status-go/protocol/protobuf"
 )
 
-const CipherMessageAutentificationFailed = "cipher: message authentication failed"
+var ErrCipherMessageAutentificationFailed = errors.New("cipher: message authentication failed")
 
 func EncryptIdentityImagesWithContactPubKeys(iis map[string]*protobuf.IdentityImage, m *Messenger) (err error) {
 	// Make AES key
@@ -79,7 +79,7 @@ image:
 			// Decrypt the main encryption AES key with AES encryption using the DH key
 			dAESKey, err := common.Decrypt(empk, sharedKey)
 			if err != nil {
-				if err.Error() == CipherMessageAutentificationFailed {
+				if err == ErrCipherMessageAutentificationFailed {
 					continue
 				}
 				return err

diff --git a/protocol/messenger_profile_showcase.go b/protocol/messenger_profile_showcase.go
@@ -199,7 +199,7 @@ func (m *Messenger) DecryptProfileShowcaseEntriesWithContactPubKeys(senderPubKey
 		// Decrypt the main encryption AES key with AES encryption using the DH key
 		dAESKey, err := common.Decrypt(eAESKey, sharedKey)
 		if err != nil {
-			if err.Error() == CipherMessageAutentificationFailed {
+			if err == ErrCipherMessageAutentificationFailed {
 				continue
 			}
 			return nil, err

diff --git a/protocol/migrations/sqlite/1699041816_profile_showcase_contacts.up.sql b/protocol/migrations/sqlite/1699041816_profile_showcase_contacts.up.sql
@@ -34,7 +34,7 @@ CREATE TABLE profile_showcase_communities_contacts (
     community_id TEXT NOT NULL,
     sort_order INT DEFAULT 0,
     contact_id TEXT NOT NULL,
-    PRIMARY KEY (community_id, contact_id)
+    PRIMARY KEY (contact_id, community_id)
 );
 
 CREATE TABLE profile_showcase_accounts_contacts (
@@ -44,19 +44,19 @@ CREATE TABLE profile_showcase_accounts_contacts (
     emoji VARCHAR DEFAULT "",
     sort_order INT DEFAULT 0,
     contact_id TEXT NOT NULL,
-    PRIMARY KEY (address, contact_id)
+    PRIMARY KEY (contact_id, address)
 );
 
 CREATE TABLE profile_showcase_collectibles_contacts (
     uid TEXT NOT NULL,
     sort_order INT DEFAULT 0,
     contact_id TEXT NOT NULL,
-    PRIMARY KEY (uid, contact_id)
+    PRIMARY KEY (contact_id, uid)
 );
 
 CREATE TABLE profile_showcase_assets_contacts (
     symbol TEXT NOT NULL,
     sort_order INT DEFAULT 0,
     contact_id TEXT NOT NULL,
-    PRIMARY KEY (symbol, contact_id)
+    PRIMARY KEY (contact_id, symbol)
 );