Skip to content

Commit

Permalink
feat(data store): add with filter
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tangui-Bitfly
Tangui-Bitfly committed Nov 22, 2024
1 parent 875d18e commit 85fdd90
Show file tree
Hide file tree
Showing 5 changed files with 132 additions and 73 deletions.
99 changes: 55 additions & 44 deletions backend/pkg/commons/db2/data/data_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package data
import (
"context"
"encoding/hex"
"fmt"
"testing"
"time"

Expand All @@ -19,6 +20,7 @@ var (
bob = common.HexToAddress("0x000000000000000000000000000000000000beef")
carl = common.HexToAddress("0x000000000000000000000000000000000000cafe")
usdc = common.HexToAddress("0x000000000000000000000000000000000000dead")
dai = common.HexToAddress("0x000000000000000000000000000000000000eeee")
)

func TestStore(t *testing.T) {
Expand All @@ -28,15 +30,13 @@ func TestStore(t *testing.T) {
if err != nil {
t.Fatal(err)
}
store := Store{
db: database.Wrap(s, Table),
}

store := NewStore(database.Wrap(s, Table))

tests := []struct {
name string
txs map[string][][]*types.Eth1TransactionIndexed // map[chainID][block][txPosition]*types.Eth1TransactionIndexed
transfers map[string][][]TransferWithIndexes
limit int64
opts []Option
addresses []common.Address
expectedHashes []string
Expand All @@ -50,7 +50,6 @@ func TestStore(t *testing.T) {
{newTx("hash3", alice, bob, "", 2)},
},
},
limit: 1,
addresses: []common.Address{alice},
expectedHashes: []string{"hash3", "hash2", "hash1"},
},
Expand All @@ -62,7 +61,6 @@ func TestStore(t *testing.T) {
{newTx("hash2", carl, bob, "", 1)},
},
},
limit: 2,
addresses: []common.Address{alice, carl},
expectedHashes: []string{"hash2", "hash1"},
},
Expand All @@ -76,7 +74,6 @@ func TestStore(t *testing.T) {
{newTx("hash4", carl, bob, "", 3)},
},
},
limit: 2,
addresses: []common.Address{alice, carl},
expectedHashes: []string{"hash4", "hash3", "hash2", "hash1"},
},
Expand All @@ -92,7 +89,6 @@ func TestStore(t *testing.T) {
{newTx("hash4", carl, bob, "", 3)},
},
},
limit: 2,
addresses: []common.Address{alice, carl},
expectedHashes: []string{"hash4", "hash3", "hash2", "hash1"},
},
Expand All @@ -108,7 +104,6 @@ func TestStore(t *testing.T) {
{newTx("hash4", alice, bob, "", 3)},
},
},
limit: 2,
addresses: []common.Address{alice, carl},
expectedHashes: []string{"hash4", "hash3", "hash2", "hash1"},
},
Expand All @@ -121,7 +116,6 @@ func TestStore(t *testing.T) {
{newTx("hash3", carl, bob, "foo", 2)},
},
},
limit: 1,
opts: []Option{OnlyTransactions(), ByMethod(hex.EncodeToString([]byte("foo")))},
addresses: []common.Address{alice},
expectedHashes: []string{"hash1"},
Expand All @@ -135,7 +129,6 @@ func TestStore(t *testing.T) {
{newTx("hash3", alice, bob, "", 2)},
},
},
limit: 1,
opts: []Option{WithTimeRange(timestamppb.New(t0), timestamppb.New(t1))},
addresses: []common.Address{alice},
expectedHashes: []string{"hash2", "hash1"},
Expand All @@ -149,7 +142,6 @@ func TestStore(t *testing.T) {
{newTx("hash3", alice, bob, "", 2)},
},
},
limit: 1,
opts: []Option{OnlySent()},
addresses: []common.Address{alice},
expectedHashes: []string{"hash3", "hash1"},
Expand All @@ -163,7 +155,6 @@ func TestStore(t *testing.T) {
{newTx("hash3", alice, bob, "", 2)},
},
},
limit: 1,
opts: []Option{OnlyReceived()},
addresses: []common.Address{bob},
expectedHashes: []string{"hash3", "hash1"},
Expand All @@ -181,7 +172,6 @@ func TestStore(t *testing.T) {
{newTransfer("hash3", alice, bob, common.Address{}, 2)},
},
},
limit: 1,
opts: []Option{OnlyTransfers()},
addresses: []common.Address{alice},
expectedHashes: []string{"hash3", "hash1"},
Expand All @@ -199,7 +189,6 @@ func TestStore(t *testing.T) {
{newTransfer("hash2", alice, bob, common.Address{}, 1)},
},
},
limit: 1,
opts: []Option{OnlyTransactions()},
addresses: []common.Address{alice},
expectedHashes: []string{"hash3", "hash1"},
Expand All @@ -224,7 +213,6 @@ func TestStore(t *testing.T) {
{newTransfer("hash10", alice, bob, common.Address{}, 9)},
},
},
limit: 2,
addresses: []common.Address{alice},
expectedHashes: []string{"hash10", "hash9", "hash8", "hash7", "hash6", "hash5", "hash4", "hash3", "hash2", "hash1"},
},
Expand All @@ -234,31 +222,28 @@ func TestStore(t *testing.T) {
"1": {
{newTransfer("hash1", alice, bob, usdc, 0)},
{newTransfer("hash2", alice, bob, usdc, 1)},
{newTransfer("hash3", alice, bob, usdc, 2)},
{newTransfer("hash3", alice, bob, dai, 2)},
{newTransfer("hash4", alice, bob, usdc, 3)},
{newTransfer("hash5", alice, bob, usdc, 4)},
},
},
limit: 2,
opts: []Option{OnlyTransfers(), ByAsset(usdc), WithTimeRange(timestamppb.New(t1), timestamppb.New(t0.Add(3*time.Second)))},
addresses: []common.Address{alice},
expectedHashes: []string{"hash4", "hash3", "hash2"},
expectedHashes: []string{"hash4", "hash2"},
},
{
name: "by asset and sender with time range",
name: "by asset and sender",
transfers: map[string][][]TransferWithIndexes{
"1": {
{newTransfer("hash1", alice, bob, usdc, 0)},
{newTransfer("hash2", bob, alice, usdc, 1)},
{newTransfer("hash3", alice, bob, usdc, 2)},
{newTransfer("hash4", bob, alice, usdc, 3)},
{newTransfer("hash5", alice, bob, usdc, 4)},
{newTransfer("hash1", bob, alice, usdc, 0)},
{newTransfer("hash2", bob, alice, dai, 1)},
{newTransfer("hash3", alice, bob, dai, 2)},
{newTransfer("hash4", alice, bob, usdc, 3)},
},
},
limit: 2,
opts: []Option{OnlyTransfers(), OnlySent(), ByAsset(usdc), WithTimeRange(timestamppb.New(t1), timestamppb.New(t0.Add(3*time.Second)))},
opts: []Option{OnlyTransfers(), ByAsset(usdc), OnlySent()},
addresses: []common.Address{alice},
expectedHashes: []string{"hash3"},
expectedHashes: []string{"hash4"},
},
{
name: "by asset and receiver with time range",
Expand All @@ -271,7 +256,6 @@ func TestStore(t *testing.T) {
{newTransfer("hash5", bob, alice, usdc, 4)},
},
},
limit: 2,
opts: []Option{OnlyTransfers(), OnlyReceived(), ByAsset(usdc), WithTimeRange(timestamppb.New(t1), timestamppb.New(t0.Add(3*time.Second)))},
addresses: []common.Address{alice},
expectedHashes: []string{"hash3"},
Expand All @@ -295,28 +279,55 @@ func TestStore(t *testing.T) {
}
}
var suffix map[string]string
for i := int64(0); i < int64(len(tt.expectedHashes))/tt.limit; i++ {
txs, newSuffix, err := store.Get(tt.addresses, suffix, tt.limit, tt.opts...)
if err != nil {
t.Fatalf("tx %d: %v", i, err)
}
if len(txs) == 0 {
t.Fatalf("tx %d: no transactions found", i)
}
if got, want := int64(len(txs)), tt.limit; got != want {
txs, _, err := store.Get(tt.addresses, suffix, 25, tt.opts...)
if err != nil {
t.Fatal(err)
}
if len(txs) == 0 {
t.Fatalf("no transactions found")
}
if got, want := len(txs), len(tt.expectedHashes); got != want {
t.Errorf("got %v, want %v", got, want)
}
for i := int64(0); i < int64(len(tt.expectedHashes)); i++ {
if got, want := string(txs[i].Hash), tt.expectedHashes[i]; got != want {
t.Errorf("got %v, want %v", got, want)
}
for j := int64(0); j < tt.limit; j++ {
if got, want := string(txs[j].Hash), tt.expectedHashes[i*tt.limit+j]; got != want {
t.Errorf("got %v, want %v", got, want)
}
}
suffix = newSuffix
}
})
}
}

func TestStoreLimitAndPagination(t *testing.T) {
client, admin := databasetest.NewBigTable(t)

s, err := database.NewBigTableWithClient(context.Background(), client, admin, Schema)
if err != nil {
t.Fatal(err)
}

store := NewStore(database.Wrap(s, Table))

for i := 0; i < 10; i++ {
err := store.AddBlockTransactions("1", []*types.Eth1TransactionIndexed{newTx(fmt.Sprintf("%d", i), common.Address{}, common.Address{}, "", int64(i))})
if err != nil {
t.Fatal(err)
}
}

var prefix map[string]string
var txs []*Interaction
for i := 9; i >= 0; i-- {
txs, prefix, err = store.Get([]common.Address{{}}, prefix, 1)
if len(txs) != 1 {
t.Errorf("got %v, want 1", len(txs))
}
if got, want := string(txs[0].Hash), fmt.Sprintf("%d", i); got != want {
t.Errorf("got %v, want %v", got, want)
}
}
}

var (
t0 = time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC)
t1 = time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC).Add(1 * time.Second)
Expand Down
8 changes: 8 additions & 0 deletions backend/pkg/commons/db2/data/filter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ func newQueryFilter(options options) (*queryFilter, error) {
query[0] = "out"
params[0] = "<address>"
}
if options.with != nil {
query = append(query, "with")
params = append(params, toHex(options.with.Bytes()))
}
if options.chainID != nil {
query = append(query, "chainID")
params = append(params, *options.chainID)
Expand All @@ -65,6 +69,10 @@ func newQueryFilter(options options) (*queryFilter, error) {
query = append(query, "method")
params = append(params, *options.method)
}
if options.asset != nil {
query = append(query, "asset")
params = append(params, toHex(options.asset.Bytes()))
}
if options.from == nil || options.to == nil {
options.from = nil
options.to = nil
Expand Down
17 changes: 17 additions & 0 deletions backend/pkg/commons/db2/data/filter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ func TestQueryFilter(t *testing.T) {
},
want: "out:<address>",
},
{
name: "sent to",
options: []Option{
OnlySent(),
With(common.Address{}),
},
want: "out:with:<address>:0000000000000000000000000000000000000000",
},
{
name: "on a chain ID",
options: []Option{
Expand Down Expand Up @@ -89,6 +97,15 @@ func TestQueryFilter(t *testing.T) {
},
want: "in:chainID:TX:method:<address>:1234:bar",
},
{
name: "received method on a chain ID",
options: []Option{
ByAsset(common.Address{}),
OnlyReceived(),
ByChainID("1234"),
},
want: "in:chainID:ERC20:asset:<address>:1234:0000000000000000000000000000000000000000",
},
{
name: "with time range",
options: []Option{
Expand Down
Loading

0 comments on commit 85fdd90

Please sign in to comment.