Skip to content

Return err on db failure #1611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yashnevatia wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Return err on db failure #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pkg/solana/ccip/chainaccessor/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,11 @@ func (a *SolanaAccessor) registerFilterIfNotExists(
}

// Filter already registered so return early
if hasFilter := a.logPoller.HasFilter(ctx, filterName); hasFilter {
exists, err := a.logPoller.HasFilter(ctx, filterName)
if err != nil {
return fmt.Errorf("failed to check filter existence: %w", err)
}
if exists {
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/solana/ccip/chainaccessor/solana_accessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var getMultipleAccountsLimit = 100
type AccessorLogPoller interface {
Start(ctx context.Context) error
Ready() error
HasFilter(context.Context, string) bool
HasFilter(context.Context, string) (bool, error)
RegisterFilter(context.Context, logpollertypes.Filter) error
FilteredLogs(context.Context, []query.Expression, query.LimitAndSort, string) ([]logpollertypes.Log, error)
CPIEventsEnabled() bool
Expand Down
2 changes: 1 addition & 1 deletion pkg/solana/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type LogPoller interface {
Start(context.Context) error
Ready() error
Close() error
HasFilter(context.Context, string) bool
HasFilter(context.Context, string) (bool, error)
RegisterFilter(ctx context.Context, filter logpollertypes.Filter) error
UnregisterFilter(ctx context.Context, name string) error
GetFilters(context.Context) (map[string]logpollertypes.Filter, error)
Expand Down
2 changes: 1 addition & 1 deletion pkg/solana/chainreader/bindings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
)

type filterRegistrar interface {
HasFilter(context.Context, string) bool
HasFilter(context.Context, string) (bool, error)
RegisterFilter(context.Context, logpollertypes.Filter) error
UnregisterFilter(ctx context.Context, name string) error
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/solana/chainreader/chain_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
type EventsReader interface {
Start(ctx context.Context) error
Ready() error
HasFilter(context.Context, string) bool
HasFilter(context.Context, string) (bool, error)
RegisterFilter(context.Context, logpollertypes.Filter) error
UnregisterFilter(ctx context.Context, name string) error
FilteredLogs(context.Context, []query.Expression, query.LimitAndSort, string) ([]logpollertypes.Log, error)
Expand Down
8 changes: 4 additions & 4 deletions pkg/solana/chainreader/event_read_binding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestBind(t *testing.T) {

lpSource := new(mocks.EventsReader)

lpSource.EXPECT().HasFilter(mock.Anything, mock.Anything).Return(false)
lpSource.EXPECT().HasFilter(mock.Anything, mock.Anything).Return(false, nil)
lpSource.EXPECT().RegisterFilter(mock.Anything, mock.Anything).Return(nil).Twice() // 1 per address 1 and 1 per address2

reader := newEventReadBinding(namespace, genericName, subkeys, lpSource, readDef, pollerConf)
Expand All @@ -63,7 +63,7 @@ func TestBind(t *testing.T) {

lpSource := new(mocks.EventsReader)

lpSource.EXPECT().HasFilter(mock.Anything, mock.Anything).Return(false)
lpSource.EXPECT().HasFilter(mock.Anything, mock.Anything).Return(false, nil)
lpSource.EXPECT().RegisterFilter(mock.Anything, mock.Anything).Return(nil).Twice() // 1 per address 1 and 1 per address2

reader := newEventReadBinding(namespace, genericName, subkeys, lpSource, readDef, pollerConf)
Expand Down Expand Up @@ -110,8 +110,8 @@ func TestBind(t *testing.T) {
require.NoError(t, reader.Register(ctx))

var ret bool
lpSource.EXPECT().HasFilter(mock.Anything, mock.Anything).RunAndReturn(func(ctx context.Context, str string) bool {
return ret
lpSource.EXPECT().HasFilter(mock.Anything, mock.Anything).RunAndReturn(func(ctx context.Context, str string) (bool, error) {
return ret, nil
})

lpSource.EXPECT().RegisterFilter(mock.Anything, mock.Anything).Return(nil).Once()
Expand Down
10 changes: 9 additions & 1 deletion pkg/solana/chainreader/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,15 @@ func (r *syncedFilter) Unregister(ctx context.Context, registrar filterRegistrar
}

func (r *syncedFilter) unregister(ctx context.Context, registrar filterRegistrar, name string) error {
if !registrar.HasFilter(ctx, name) {
exists, err := registrar.HasFilter(ctx, name)
if err != nil {
return FilterError{
Err: fmt.Errorf("%w: %s", types.ErrInternal, err.Error()),
Action: "check existence",
Filter: r.filter,
}
}
if !exists {
return nil
}

Expand Down
20 changes: 15 additions & 5 deletions pkg/solana/chainreader/mocks/events_reader.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/solana/logpoller/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,13 @@ func (fl *filters) PruneLogs(ctx context.Context) error {
return nil
}

func (fl *filters) HasFilter(ctx context.Context, name string) bool {
func (fl *filters) HasFilter(ctx context.Context, name string) (bool, error) {
exists, err := fl.orm.HasFilter(ctx, name)
if err != nil {
return false
return false, err
}

return exists
return exists, nil
}

// RegisterFilter persists provided filter and ensures that any log emitted by a contract with filter.Address
Expand Down
4 changes: 2 additions & 2 deletions pkg/solana/logpoller/log_poller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type logsLoader interface {
}

type filtersI interface {
HasFilter(ctx context.Context, name string) bool
HasFilter(ctx context.Context, name string) (bool, error)
RegisterFilter(ctx context.Context, filter types.Filter) error
UnregisterFilter(ctx context.Context, name string) error
LoadFilters(ctx context.Context) error
Expand Down Expand Up @@ -279,7 +279,7 @@ func (lp *Service) Process(ctx context.Context, programEvent types.ProgramEvent)
return nil
}

func (lp *Service) HasFilter(ctx context.Context, name string) bool {
func (lp *Service) HasFilter(ctx context.Context, name string) (bool, error) {
ctx, cancel := lp.eng.Ctx(ctx)
defer cancel()

Expand Down
20 changes: 15 additions & 5 deletions pkg/solana/logpoller/mocks/mock_filters.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions pkg/solana/solana_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,11 @@ func (ss *solanaService) RegisterLogTracking(ctx context.Context, req commonsol.
return err
}

if lp.HasFilter(ctx, req.Name) {
exists, err := lp.HasFilter(ctx, req.Name)
if err != nil {
return fmt.Errorf("failed to check filter existence: %w", err)
}
if exists {
return nil
}

Expand All @@ -173,7 +177,11 @@ func (ss *solanaService) UnregisterLogTracking(ctx context.Context, filterName s
return err
}

if !lp.HasFilter(ctx, filterName) {
exists, err := lp.HasFilter(ctx, filterName)
if err != nil {
return fmt.Errorf("failed to check filter existence: %w", err)
}
if !exists {
return nil
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/solana/solana_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,10 +976,10 @@ type mockLogPoller struct {
ready error
}

func (m *mockLogPoller) Start(context.Context) error { return nil }
func (m *mockLogPoller) Ready() error { return m.ready }
func (m *mockLogPoller) Close() error { return nil }
func (m *mockLogPoller) HasFilter(context.Context, string) bool { return false }
func (m *mockLogPoller) Start(context.Context) error { return nil }
func (m *mockLogPoller) Ready() error { return m.ready }
func (m *mockLogPoller) Close() error { return nil }
func (m *mockLogPoller) HasFilter(context.Context, string) (bool, error) { return false, nil }
func (m *mockLogPoller) RegisterFilter(context.Context, logpollertypes.Filter) error {
return nil
}
Expand Down
Loading