status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: review comments applied 

`GetKeypairs(includeRemoved bool)` removed
`GetActiveKeypairs()` added
`GetAllKeypairs()` added

`GetAccounts(includeRemoved bool)` removed
`GetActiveAccounts()` added
`GetAllAccounts()` added
This commit is contained in:
Sale Djenic 2023-07-25 17:17:17 +02:00 committed by saledjenic
parent d5bba5d80f
commit 6a5cdbaa8b
19 changed files with 83 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/geth_backend.go
View File

@ -694,7 +694,7 @@ func (b *GethStatusBackend) MigrateKeyStoreDir(acc multiaccounts.Account, passwo
if err != nil {
return err
}
accounts, err := accountDB.GetAccounts(false)
accounts, err := accountDB.GetActiveAccounts()
if err != nil {
return err
}
@ -1168,7 +1168,7 @@ func (b *GethStatusBackend) ConvertToRegularAccount(mnemonic string, currPasswor
return err
}
knownAccounts, err := db.GetAccounts(false)
knownAccounts, err := db.GetActiveAccounts()
if err != nil {
return err
}

20
multiaccounts/accounts/database.go
View File

@ -713,8 +713,14 @@ func (db *Database) markKeypairRemoved(tx *sql.Tx, keyUID string, clock uint64)
return err
}
func (db *Database) GetKeypairs(includeRemoved bool) ([]*Keypair, error) {
return db.getKeypairs(nil, "", includeRemoved)
// Returns active keypairs (excluding removed and excluding removed accounts).
func (db *Database) GetActiveKeypairs() ([]*Keypair, error) {
return db.getKeypairs(nil, "", false)
}
// Returns all keypairs (including removed and removed accounts).
func (db *Database) GetAllKeypairs() ([]*Keypair, error) {
return db.getKeypairs(nil, "", true)
}
// Returns keypair if it is not marked as removed and its accounts which are not marked as removed.
@ -722,8 +728,14 @@ func (db *Database) GetKeypairByKeyUID(keyUID string) (*Keypair, error) {
return db.getKeypairByKeyUID(nil, keyUID)
}
func (db *Database) GetAccounts(includeRemoved bool) ([]*Account, error) {
return db.getAccounts(nil, types.Address{}, includeRemoved)
// Returns active accounts (excluding removed).
func (db *Database) GetActiveAccounts() ([]*Account, error) {
return db.getAccounts(nil, types.Address{}, false)
}
// Returns all accounts (including removed).
func (db *Database) GetAllAccounts() ([]*Account, error) {
return db.getAccounts(nil, types.Address{}, true)
}
// Returns account if it is not marked as removed.

46
multiaccounts/accounts/database_test.go
View File

@ -66,7 +66,7 @@ func TestMoveWalletAccount(t *testing.T) {
{Address: types.Address{0x06}, Type: AccountTypeWatch, Position: 5},
}
require.NoError(t, db.SaveOrUpdateAccounts(accounts, false))
dbAccounts, err := db.GetAccounts(false)
dbAccounts, err := db.GetActiveAccounts()
require.NoError(t, err)
require.Len(t, dbAccounts, len(accounts))
for i := 0; i < len(accounts); i++ {
@ -95,7 +95,7 @@ func TestMoveWalletAccount(t *testing.T) {
{Address: types.Address{0x06}, Type: AccountTypeWatch, Position: 5},
}
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
for i := 0; i < len(accounts); i++ {
require.True(t, SameAccounts(accounts[i], dbAccounts[i]))
@ -121,7 +121,7 @@ func TestMoveWalletAccount(t *testing.T) {
{Address: types.Address{0x02}, Type: AccountTypeWatch, Position: 5},
}
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
for i := 0; i < len(accounts); i++ {
require.True(t, SameAccounts(accounts[i], dbAccounts[i]))
@ -184,7 +184,7 @@ func TestWatchOnlyAccounts(t *testing.T) {
defer stop()
// check the db
dbAccounts, err := db.GetAccounts(false)
dbAccounts, err := db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, 0, len(dbAccounts))
@ -197,7 +197,7 @@ func TestWatchOnlyAccounts(t *testing.T) {
require.Error(t, err)
// check the db after that trying to save keypair with watch only accounts
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, 0, len(dbAccounts))
@ -207,7 +207,7 @@ func TestWatchOnlyAccounts(t *testing.T) {
_, err = db.GetKeypairByKeyUID(woAccounts[0].KeyUID)
require.Error(t, err)
require.True(t, err == ErrDbKeypairNotFound)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(woAccounts), len(dbAccounts))
require.Equal(t, woAccounts[0].Address, dbAccounts[0].Address)
@ -215,7 +215,7 @@ func TestWatchOnlyAccounts(t *testing.T) {
// try to save the same watch only account again
err = db.SaveOrUpdateAccounts(woAccounts[:1], false)
require.NoError(t, err)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(woAccounts), len(dbAccounts))
dbAcc, err := db.GetAccountByAddress(woAccounts[:1][0].Address)
@ -232,7 +232,7 @@ func TestWatchOnlyAccounts(t *testing.T) {
}
err = db.SaveOrUpdateAccounts([]*Account{wo4}, false)
require.NoError(t, err)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(woAccounts)+1, len(dbAccounts))
dbAcc, err = db.GetAccountByAddress(wo4.Address)
@ -245,7 +245,7 @@ func TestWatchOnlyAccounts(t *testing.T) {
wo4.Emoji = wo4.Emoji + "updated"
err = db.SaveOrUpdateAccounts([]*Account{wo4}, false)
require.NoError(t, err)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(woAccounts)+1, len(dbAccounts))
dbAcc, err = db.GetAccountByAddress(wo4.Address)
@ -260,7 +260,7 @@ func TestWatchOnlyAccounts(t *testing.T) {
// try to delete watch only account
err = db.RemoveAccount(wo4.Address, 0)
require.NoError(t, err)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(woAccounts), len(dbAccounts))
_, err = db.GetAccountByAddress(wo4.Address)
@ -275,14 +275,14 @@ func TestUpdateKeypairName(t *testing.T) {
kp := GetProfileKeypairForTest(true, false, false)
// check the db
dbAccounts, err := db.GetAccounts(false)
dbAccounts, err := db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, 0, len(dbAccounts))
// save keypair
err = db.SaveOrUpdateKeypair(kp)
require.NoError(t, err)
dbKeypairs, err := db.GetKeypairs(false)
dbKeypairs, err := db.GetActiveKeypairs()
require.NoError(t, err)
require.Equal(t, 1, len(dbKeypairs))
require.True(t, SameKeypairs(kp, dbKeypairs[0]))
@ -313,10 +313,10 @@ func TestKeypairs(t *testing.T) {
defer stop()
// check the db
dbKeypairs, err := db.GetKeypairs(false)
dbKeypairs, err := db.GetActiveKeypairs()
require.NoError(t, err)
require.Equal(t, 0, len(dbKeypairs))
dbAccounts, err := db.GetAccounts(false)
dbAccounts, err := db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, 0, len(dbAccounts))
@ -328,7 +328,7 @@ func TestKeypairs(t *testing.T) {
// save keypair
err = db.SaveOrUpdateKeypair(kp)
require.NoError(t, err)
dbKeypairs, err = db.GetKeypairs(false)
dbKeypairs, err = db.GetActiveKeypairs()
require.NoError(t, err)
require.Equal(t, 1, len(dbKeypairs))
dbKp, err := db.GetKeypairByKeyUID(kp.KeyUID)
@ -336,7 +336,7 @@ func TestKeypairs(t *testing.T) {
require.Equal(t, len(kp.Accounts), len(dbKp.Accounts))
kp.LastUsedDerivationIndex = expectedLastUsedDerivationIndex
require.Equal(t, kp.KeyUID, dbKp.KeyUID)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(kp.Accounts), len(dbAccounts))
@ -350,7 +350,7 @@ func TestKeypairs(t *testing.T) {
// save keypair again to test the flow below
err = db.SaveOrUpdateKeypair(kp)
require.NoError(t, err)
dbKeypairs, err = db.GetKeypairs(false)
dbKeypairs, err = db.GetActiveKeypairs()
require.NoError(t, err)
require.Equal(t, 1, len(dbKeypairs))
@ -364,7 +364,7 @@ func TestKeypairs(t *testing.T) {
require.NoError(t, err)
require.Equal(t, len(kp.Accounts), len(dbKp.Accounts))
require.Equal(t, kp.KeyUID, dbKp.KeyUID)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(kp.Accounts), len(dbAccounts))
@ -378,7 +378,7 @@ func TestKeypairs(t *testing.T) {
dbKp, err = db.GetKeypairByKeyUID(kp.KeyUID)
require.NoError(t, err)
require.Equal(t, len(kp.Accounts), len(dbKp.Accounts))
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(kp.Accounts), len(dbAccounts))
dbAcc, err := db.GetAccountByAddress(accToUpdate.Address)
@ -390,7 +390,7 @@ func TestKeypairs(t *testing.T) {
kpToUpdate.Name = kpToUpdate.Name + "updated"
err = db.SaveOrUpdateKeypair(kp)
require.NoError(t, err)
dbKeypairs, err = db.GetKeypairs(false)
dbKeypairs, err = db.GetActiveKeypairs()
require.NoError(t, err)
require.Equal(t, 1, len(dbKeypairs))
dbKp, err = db.GetKeypairByKeyUID(kp.KeyUID)
@ -411,7 +411,7 @@ func TestKeypairs(t *testing.T) {
require.NoError(t, err)
require.Equal(t, len(kp.Accounts)+1, len(dbKp.Accounts))
require.Equal(t, kp.LastUsedDerivationIndex, dbKp.LastUsedDerivationIndex)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(kp.Accounts)+1, len(dbAccounts))
dbAcc, err = db.GetAccountByAddress(accToUpdate.Address)
@ -440,7 +440,7 @@ func TestKeypairs(t *testing.T) {
require.NoError(t, err)
require.Equal(t, len(kp.Accounts)+2, len(dbKp.Accounts))
require.Equal(t, expectedLastUsedDerivationIndex, dbKp.LastUsedDerivationIndex)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(kp.Accounts)+2, len(dbAccounts))
dbAcc, err = db.GetAccountByAddress(accToUpdate.Address)
@ -450,7 +450,7 @@ func TestKeypairs(t *testing.T) {
// delete account
err = db.RemoveAccount(accToAdd.Address, 0)
require.NoError(t, err)
dbAccounts, err = db.GetAccounts(false)
dbAccounts, err = db.GetActiveAccounts()
require.NoError(t, err)
require.Equal(t, len(kp.Accounts)+1, len(dbAccounts))
_, err = db.GetAccountByAddress(accToAdd.Address)

6
multiaccounts/accounts/keycard_database_test.go
View File

@ -28,7 +28,7 @@ func TestKeycards(t *testing.T) {
require.NoError(t, err)
err = db.SaveOrUpdateKeypair(kp2)
require.NoError(t, err)
dbKeypairs, err := db.GetKeypairs(false)
dbKeypairs, err := db.GetActiveKeypairs()
require.NoError(t, err)
require.Equal(t, 2, len(dbKeypairs))
@ -168,7 +168,7 @@ func TestKeycardsRemovalWhenDeletingKeypair(t *testing.T) {
// Pre-condition
err := db.SaveOrUpdateKeypair(kp2)
require.NoError(t, err)
dbKeypairs, err := db.GetKeypairs(false)
dbKeypairs, err := db.GetActiveKeypairs()
require.NoError(t, err)
require.Equal(t, 1, len(dbKeypairs))
@ -197,7 +197,7 @@ func TestKeycardsRemovalWhenDeletingKeypair(t *testing.T) {
require.NoError(t, err)
// Check db state after deletion
dbKeypairs, err = db.GetKeypairs(false)
dbKeypairs, err = db.GetActiveKeypairs()
require.NoError(t, err)
require.Equal(t, 0, len(dbKeypairs))

2
multiaccounts/accounts/testutils.go
View File

@ -13,7 +13,7 @@ func MockTestAccounts(tb testing.TB, db *sql.DB, accounts []*Account) {
err = d.SaveOrUpdateAccounts(accounts, false)
require.NoError(tb, err)
res, err := d.GetAccounts(false)
res, err := d.GetActiveAccounts()
require.NoError(tb, err)
require.Equal(tb, accounts[0].Address, res[0].Address)
}

2
protocol/communities_messenger_token_permissions_test.go
View File

@ -151,7 +151,7 @@ func (s *MessengerCommunitiesTokenPermissionsSuite) newMessenger(password string
s.Require().NoError(err)
}
walletAccounts, err := messenger.settings.GetAccounts(false)
walletAccounts, err := messenger.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Len(walletAccounts, len(walletAddresses))
for i := range walletAddresses {

2
protocol/messenger.go
View File

@ -2565,7 +2565,7 @@ func (m *Messenger) SyncDevices(ctx context.Context, ensName, photoPath string,
}
// we have to sync deleted keypairs as well
keypairs, err := m.settings.GetKeypairs(true)
keypairs, err := m.settings.GetAllKeypairs()
if err != nil {
return err
}

2
protocol/messenger_backup.go
View File

@ -421,7 +421,7 @@ func (m *Messenger) backupProfile(ctx context.Context, clock uint64) ([]*protobu
}
func (m *Messenger) backupKeypairs() ([]*protobuf.Backup, error) {
keypairs, err := m.settings.GetKeypairs(false)
keypairs, err := m.settings.GetActiveKeypairs()
if err != nil {
return nil, err
}

2
protocol/messenger_backup_test.go
View File

@ -772,7 +772,7 @@ func (s *MessengerBackupSuite) TestBackupKeycards() {
s.Require().NoError(err)
err = bob1.settings.SaveOrUpdateKeypair(kp3)
s.Require().NoError(err)
dbKeypairs, err := bob1.settings.GetKeypairs(false)
dbKeypairs, err := bob1.settings.GetActiveKeypairs()
s.Require().NoError(err)
s.Require().Equal(3, len(dbKeypairs))

12
protocol/messenger_communities.go
View File

@ -752,7 +752,7 @@ func (m *Messenger) SetMutePropertyOnChatsByCategory(request *requests.MuteCateg
// getAccountsToShare is used to get the wallet accounts to share either when requesting to join a community or when editing
// requestToJoinID can be empty when editing
func (m *Messenger) getAccountsToShare(addressesToReveal []string, airdropAddress string, communityID types.HexBytes, password string, requestToJoinID []byte) (map[gethcommon.Address]*protobuf.RevealedAccount, []gethcommon.Address, error) {
walletAccounts, err := m.settings.GetAccounts(false)
walletAccounts, err := m.settings.GetActiveAccounts()
if err != nil {
return nil, nil, err
}
@ -819,7 +819,7 @@ func (m *Messenger) RequestToJoinCommunity(request *requests.RequestToJoinCommun
}
if request.Password != "" {
walletAccounts, err := m.settings.GetAccounts(false)
walletAccounts, err := m.settings.GetActiveAccounts()
if err != nil {
return nil, err
}
@ -975,7 +975,7 @@ func (m *Messenger) EditSharedAddressesForCommunity(request *requests.EditShared
return nil, err
}
walletAccounts, err := m.settings.GetAccounts(false)
walletAccounts, err := m.settings.GetActiveAccounts()
if err != nil {
return nil, err
}
@ -4122,7 +4122,7 @@ func (m *Messenger) CheckPermissionsToJoinCommunity(request *requests.CheckPermi
return nil, err
}
accounts, err := m.settings.GetAccounts(false)
accounts, err := m.settings.GetActiveAccounts()
if err != nil {
return nil, err
}
@ -4141,7 +4141,7 @@ func (m *Messenger) CheckCommunityChannelPermissions(request *requests.CheckComm
return nil, err
}
accounts, err := m.settings.GetAccounts(false)
accounts, err := m.settings.GetActiveAccounts()
if err != nil {
return nil, err
}
@ -4160,7 +4160,7 @@ func (m *Messenger) CheckAllCommunityChannelsPermissions(request *requests.Check
return nil, err
}
accounts, err := m.settings.GetAccounts(false)
accounts, err := m.settings.GetActiveAccounts()
if err != nil {
return nil, err
}

4
protocol/messenger_sync_keycard_change_test.go
View File

@ -89,7 +89,7 @@ func (s *MessengerSyncKeycardChangeSuite) SetupTest() {
s.Require().NoError(err)
// err = s.main.settings.SaveOrUpdateKeypair(kp3)
// s.Require().NoError(err)
dbKeypairs, err := s.main.settings.GetKeypairs(false)
dbKeypairs, err := s.main.settings.GetActiveKeypairs()
s.Require().NoError(err)
s.Require().Equal(2, len(dbKeypairs))
@ -103,7 +103,7 @@ func (s *MessengerSyncKeycardChangeSuite) SetupTest() {
s.Require().NoError(err)
// err = s.other.settings.SaveOrUpdateKeypair(kp3)
// s.Require().NoError(err)
dbKeypairs, err = s.other.settings.GetKeypairs(false)
dbKeypairs, err = s.other.settings.GetActiveKeypairs()
s.Require().NoError(err)
s.Require().Equal(2, len(dbKeypairs))
}

4
protocol/messenger_sync_keycards_state_test.go
View File

@ -89,7 +89,7 @@ func (s *MessengerSyncKeycardsStateSuite) SetupTest() {
s.Require().NoError(err)
err = s.main.settings.SaveOrUpdateKeypair(kp3)
s.Require().NoError(err)
dbKeypairs, err := s.main.settings.GetKeypairs(false)
dbKeypairs, err := s.main.settings.GetActiveKeypairs()
s.Require().NoError(err)
s.Require().Equal(3, len(dbKeypairs))
@ -103,7 +103,7 @@ func (s *MessengerSyncKeycardsStateSuite) SetupTest() {
s.Require().NoError(err)
err = s.other.settings.SaveOrUpdateKeypair(kp3)
s.Require().NoError(err)
dbKeypairs, err = s.other.settings.GetKeypairs(false)
dbKeypairs, err = s.other.settings.GetActiveKeypairs()
s.Require().NoError(err)
s.Require().Equal(3, len(dbKeypairs))
}

28
protocol/messenger_sync_wallets_test.go
View File

@ -151,7 +151,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWallets() {
s.Require().Equal(len(woAccounts), len(dbWoAccounts1))
s.Require().True(haveSameElements(woAccounts, dbWoAccounts1, accounts.SameAccounts))
dbAccounts1, err := s.m.settings.GetAccounts(false)
dbAccounts1, err := s.m.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(len(profileKp.Accounts)+len(seedPhraseKp.Accounts)+len(privKeyKp.Accounts)+len(woAccounts), len(dbAccounts1))
@ -211,7 +211,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWallets() {
s.Require().Equal(len(woAccounts), len(dbWoAccounts2))
s.Require().True(haveSameElements(woAccounts, dbWoAccounts2, accounts.SameAccounts))
dbAccounts2, err := alicesOtherDevice.settings.GetAccounts(false)
dbAccounts2, err := alicesOtherDevice.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(len(profileKp.Accounts)+len(seedPhraseKp.Accounts)+len(privKeyKp.Accounts)+len(woAccounts), len(dbAccounts2))
@ -297,7 +297,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountsReorder() {
err = s.m.settings.SaveOrUpdateAccounts(woAccounts, false)
s.Require().NoError(err, "wo accounts alice.settings.SaveOrUpdateKeypair")
dbAccounts, err := s.m.settings.GetAccounts(false)
dbAccounts, err := s.m.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(len(woAccounts), len(dbAccounts)-1)
@ -310,7 +310,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountsReorder() {
err = alicesOtherDevice.settings.SaveOrUpdateAccounts(woAccounts, false)
s.Require().NoError(err, "wo accounts alice.settings.SaveOrUpdateKeypair")
dbAccounts, err = alicesOtherDevice.settings.GetAccounts(false)
dbAccounts, err = alicesOtherDevice.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(len(woAccounts), len(dbAccounts)-1)
@ -358,7 +358,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountsReorder() {
{Address: types.Address{0x16}, Type: accounts.AccountTypeWatch, Position: 5},
}
dbAccounts, err = s.m.settings.GetAccounts(false)
dbAccounts, err = s.m.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(len(woAccounts), len(dbAccounts)-1)
for i := 0; i < len(woAccounts); i++ {
@ -380,7 +380,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountsReorder() {
s.Require().NoError(err)
// check on alice's other device
dbAccounts, err = alicesOtherDevice.settings.GetAccounts(false)
dbAccounts, err = alicesOtherDevice.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(len(woAccounts), len(dbAccounts)-1)
for i := 0; i < len(woAccounts); i++ {
@ -408,7 +408,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountsReorder() {
{Address: types.Address{0x12}, Type: accounts.AccountTypeWatch, Position: 5},
}
dbAccounts, err = s.m.settings.GetAccounts(false)
dbAccounts, err = s.m.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(len(woAccounts), len(dbAccounts)-1)
for i := 0; i < len(woAccounts); i++ {
@ -430,7 +430,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountsReorder() {
s.Require().NoError(err)
// check on alice's other device
dbAccounts, err = alicesOtherDevice.settings.GetAccounts(false)
dbAccounts, err = alicesOtherDevice.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(len(woAccounts), len(dbAccounts)-1)
for i := 0; i < len(woAccounts); i++ {
@ -491,7 +491,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountOrderAfterDeletion() {
err = s.m.settings.SaveOrUpdateAccounts(woAccounts, false)
s.Require().NoError(err)
// Check accounts
dbAccounts1, err := s.m.settings.GetAccounts(false)
dbAccounts1, err := s.m.settings.GetActiveAccounts()
s.Require().NoError(err)
totalNumOfAccounts := len(profileKp.Accounts) + len(seedPhraseKp.Accounts) + len(privKeyKp.Accounts) + len(woAccounts)
s.Require().Equal(totalNumOfAccounts, len(dbAccounts1))
@ -553,7 +553,7 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountOrderAfterDeletion() {
})
s.Require().NoError(err)
dbAccounts2, err := alicesOtherDevice.settings.GetAccounts(false)
dbAccounts2, err := alicesOtherDevice.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(totalNumOfAccounts, len(dbAccounts2))
@ -579,11 +579,11 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountOrderAfterDeletion() {
})
s.Require().NoError(err)
dbAccounts1, err = s.m.settings.GetAccounts(false)
dbAccounts1, err = s.m.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(totalNumOfAccounts, len(dbAccounts1))
dbAccounts2, err = alicesOtherDevice.settings.GetAccounts(false)
dbAccounts2, err = alicesOtherDevice.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(totalNumOfAccounts, len(dbAccounts2))
@ -609,11 +609,11 @@ func (s *MessengerSyncWalletSuite) TestSyncWalletAccountOrderAfterDeletion() {
})
s.Require().NoError(err)
dbAccounts1, err = s.m.settings.GetAccounts(false)
dbAccounts1, err = s.m.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(totalNumOfAccounts, len(dbAccounts1))
dbAccounts2, err = alicesOtherDevice.settings.GetAccounts(false)
dbAccounts2, err = alicesOtherDevice.settings.GetActiveAccounts()
s.Require().NoError(err)
s.Require().Equal(totalNumOfAccounts, len(dbAccounts2))

8
protocol/messenger_wallet.go
View File

@ -27,7 +27,7 @@ func (m *Messenger) retrieveWalletBalances() error {
if m.walletAPI == nil {
m.logger.Warn("wallet api not enabled")
}
accounts, err := m.settings.GetAccounts(false)
accounts, err := m.settings.GetActiveAccounts()
if err != nil {
return err
}
@ -375,7 +375,7 @@ func (m *Messenger) syncAccountsPositions(rawMessageHandler RawMessageHandler) e
_, chat := m.getLastClockWithRelatedChat()
allDbAccounts, err := m.settings.GetAccounts(false)
allDbAccounts, err := m.settings.GetActiveAccounts()
if err != nil {
return err
}
@ -480,7 +480,7 @@ func (m *Messenger) resolveAndSyncKeypairOrJustWalletAccount(keyUID string, addr
if keyUID == "" {
var dbAccount *accounts.Account
allDbAccounts, err := m.settings.GetAccounts(true) // removed accounts included
allDbAccounts, err := m.settings.GetAllAccounts() // removed accounts included
if err != nil {
return err
}
@ -502,7 +502,7 @@ func (m *Messenger) resolveAndSyncKeypairOrJustWalletAccount(keyUID string, addr
}
} else {
var dbKeypair *accounts.Keypair
allDbKeypairs, err := m.settings.GetKeypairs(true) // removed keypairs included
allDbKeypairs, err := m.settings.GetAllKeypairs() // removed keypairs included
if err != nil {
return err
}

4
services/accounts/accounts.go
View File

@ -81,7 +81,7 @@ func (api *API) MoveWalletAccount(ctx context.Context, fromPosition int64, toPos
}
func (api *API) GetAccounts(ctx context.Context) ([]*accounts.Account, error) {
return api.db.GetAccounts(false)
return api.db.GetActiveAccounts()
}
func (api *API) GetWatchOnlyAccounts(ctx context.Context) ([]*accounts.Account, error) {
@ -89,7 +89,7 @@ func (api *API) GetWatchOnlyAccounts(ctx context.Context) ([]*accounts.Account,
}
func (api *API) GetKeypairs(ctx context.Context) ([]*accounts.Keypair, error) {
return api.db.GetKeypairs(false)
return api.db.GetActiveKeypairs()
}
func (api *API) GetAccountByAddress(ctx context.Context, address types.Address) (*accounts.Account, error) {

2
services/ext/service.go
View File

@ -322,7 +322,7 @@ func (s *Service) verifyTransactionLoop(tick time.Duration, cancel <-chan struct
for {
select {
case <-ticker.C:
accounts, err := s.accountsDB.GetAccounts(false)
accounts, err := s.accountsDB.GetActiveAccounts()
if err != nil {
log.Error("failed to retrieve accounts", "err", err)
}

2
services/stickers/api.go
View File

@ -105,7 +105,7 @@ func NewAPI(ctx context.Context, acc *accounts.Database, rpcClient *rpc.Client,
func (api *API) Market(chainID uint64) ([]StickerPack, error) {
// TODO: eventually this should be changed to include pagination
accs, err := api.accountsDB.GetAccounts(false)
accs, err := api.accountsDB.GetActiveAccounts()
if err != nil {
return nil, err
}

2
services/stickers/pending.go
View File

@ -80,7 +80,7 @@ func (api *API) ProcessPending(chainID uint64) (pendingChanged StickerPackCollec
return nil, err
}
accs, err := api.accountsDB.GetAccounts(false)
accs, err := api.accountsDB.GetActiveAccounts()
if err != nil {
return nil, err
}

2
services/wallet/api.go
View File

@ -433,7 +433,7 @@ func (api *API) GetDerivedAddressesForMnemonic(ctx context.Context, mnemonic str
// Generates addresses for the provided paths, response doesn't include `HasActivity` value (if you need it check `GetAddressDetails` function)
func (api *API) getDerivedAddresses(id string, paths []string) ([]*DerivedAddress, error) {
addedAccounts, err := api.s.accountsDB.GetAccounts(false)
addedAccounts, err := api.s.accountsDB.GetActiveAccounts()
if err != nil {
return nil, err
}