Skip to content

Commit 4505816

Browse files
committed
chore_: address review comments
1 parent 3a6eba3 commit 4505816

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

protocol/messenger_backup.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ func (m *Messenger) BackupData(ctx context.Context) (uint64, error) {
101101
if err != nil {
102102
return 0, err
103103
}
104-
_, settings, errors := m.prepareSyncSettingsMessages(clock, true)
105-
if len(errors) != 0 {
104+
_, settings, err := m.prepareSyncSettingsMessages(clock, true)
105+
if err != nil {
106106
// return just the first error, the others have been logged
107-
return 0, errors[0]
107+
return 0, err
108108
}
109109

110110
keypairsToBackup, err := m.backupKeypairs()

protocol/messenger_local_backup.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,9 @@ func (m *Messenger) BackupDataLocally(ctx context.Context) error {
7474
if err != nil {
7575
return err
7676
}
77-
_, settings, errors := m.prepareSyncSettingsMessages(clock, true)
78-
if len(errors) != 0 {
79-
// return just the first error, the others have been logged
80-
return errors[0]
77+
_, settings, err := m.prepareSyncSettingsMessages(clock, true)
78+
if err != nil {
79+
return err
8180
}
8281
woAccountsToBackup, err := m.backupWatchOnlyAccounts()
8382
if err != nil {

protocol/messenger_sync_settings.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package protocol
33
import (
44
"context"
55
"encoding/json"
6+
errorsLib "errors"
67

78
"go.uber.org/zap"
89

@@ -14,10 +15,11 @@ import (
1415
)
1516

1617
// syncSettings syncs all settings that are syncable
17-
func (m *Messenger) prepareSyncSettingsMessages(currentClock uint64, prepareForBackup bool) (resultRaw []*common.RawMessage, resultSync []*protobuf.SyncSetting, errors []error) {
18+
func (m *Messenger) prepareSyncSettingsMessages(currentClock uint64, prepareForBackup bool) (resultRaw []*common.RawMessage, resultSync []*protobuf.SyncSetting, errorResult error) {
19+
var errors []error
1820
s, err := m.settings.GetSettings()
1921
if err != nil {
20-
errors = append(errors, err)
22+
errorResult = err
2123
return
2224
}
2325

@@ -36,7 +38,7 @@ func (m *Messenger) prepareSyncSettingsMessages(currentClock uint64, prepareForB
3638
clock, err := m.settings.GetSettingLastSynced(sf)
3739
if err != nil {
3840
logger.Error("m.settings.GetSettingLastSynced", zap.Error(err), zap.String("SettingField", sf.GetDBName()))
39-
errors = append(errors, err)
41+
errorResult = err
4042
return
4143
}
4244
if clock == 0 {
@@ -55,18 +57,18 @@ func (m *Messenger) prepareSyncSettingsMessages(currentClock uint64, prepareForB
5557
resultSync = append(resultSync, sm)
5658
}
5759
}
60+
errorResult = errorsLib.Join(errors...)
5861
return
5962
}
6063

6164
func (m *Messenger) syncSettings(rawMessageHandler RawMessageHandler) error {
6265
logger := m.logger.Named("syncSettings")
6366

6467
clock, _ := m.getLastClockWithRelatedChat()
65-
rawMessages, _, errors := m.prepareSyncSettingsMessages(clock, false)
68+
rawMessages, _, err := m.prepareSyncSettingsMessages(clock, false)
6669

67-
if len(errors) != 0 {
68-
// return just the first error, the others have been logged
69-
return errors[0]
70+
if err != nil {
71+
return err
7072
}
7173

7274
for _, rm := range rawMessages {

0 commit comments

Comments
 (0)