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: issues after rebase fixed

This commit is contained in:
Sale Djenic 2023-05-24 09:32:11 +02:00 committed by saledjenic
parent b16a38408a
commit 0eca7f5088
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multiaccounts/accounts/testutils.go
View File

@ -11,7 +11,7 @@ func AddTestAccounts(t *testing.T, db *sql.DB, accounts []*Account) {
d, err := NewDB(db) d, err := NewDB(db)
require.NoError(t, err) require.NoError(t, err)
err = d.SaveAccounts(accounts) err = d.SaveOrUpdateAccounts(accounts)
require.NoError(t, err) require.NoError(t, err)
res, err := d.GetAccounts() res, err := d.GetAccounts()
require.NoError(t, err) require.NoError(t, err)

2
services/wallet/activity/activity.go
View File

@ -212,7 +212,7 @@ const (
? AS includeAllNetworks ? AS includeAllNetworks
), ),
filter_addresses(address) AS ( filter_addresses(address) AS (
SELECT HEX(address) FROM accounts WHERE (SELECT filterAllAddresses FROM filter_conditions) != 0 SELECT HEX(address) FROM keypairs_accounts WHERE (SELECT filterAllAddresses FROM filter_conditions) != 0
UNION ALL UNION ALL
SELECT * FROM (VALUES %s) WHERE (SELECT filterAllAddresses FROM filter_conditions) = 0 SELECT * FROM (VALUES %s) WHERE (SELECT filterAllAddresses FROM filter_conditions) = 0
), ),

4
services/wallet/activity/activity_test.go
View File

@ -179,8 +179,8 @@ func TestGetActivityEntriesWithSameTransactionForSenderAndReceiverInDB(t *testin
// add accounts to DB for proper detection of sender/receiver in all cases // add accounts to DB for proper detection of sender/receiver in all cases
accounts.AddTestAccounts(t, db, []*accounts.Account{ accounts.AddTestAccounts(t, db, []*accounts.Account{
{Address: types.Address(td.tr1.From), Chat: false, Wallet: true}, {Address: types.Address(td.tr1.From), Type: accounts.AccountTypeWatch},
{Address: types.Address(receiverTr.From)}, {Address: types.Address(receiverTr.From), Type: accounts.AccountTypeWatch},
}) })
entries, err = GetActivityEntries(db, []eth.Address{}, []common.ChainID{}, filter, 0, 10) entries, err = GetActivityEntries(db, []eth.Address{}, []common.ChainID{}, filter, 0, 10)