LogPoller e2e test fixes #1046

dhaidashenko · 2025-02-06T17:34:44Z

core ref: 461d94af9431de5ee79447ab6972e3d2f64775fe

PR includes the following fixes:

Makes work with EventSignature and Discriminator consistent.
Ensure that already scheduled get block jobs can be canceled if backfill fails
Recover from panic in case of reflect issues & support non addressable arrays for IndexedValue

dhaidashenko · 2025-02-06T18:54:21Z

pkg/solana/logpoller/loader.go

 		err := c.workers.Do(ctx, getBlockJobs[i])
 		if err != nil {
 			return nil, fmt.Errorf("could not schedule job to fetch blocks for slot: %w", err)
 		}
 	}

-	c.engine.Go(func(ctx context.Context) {
+	go func() {


need to cancel this goroutine if iteration gets aborted

reductionista · 2025-02-07T17:21:12Z

pkg/solana/codec/discriminator_extractor_test.go

@@ -38,7 +38,7 @@ func FuzzExtractorHappyPath(f *testing.F) {

 		stdDecoded, err := base64.StdEncoding.DecodeString(testString)
 		if err == nil {
-			require.Equal(t, stdDecoded[:8], extractor.Extract(testString))
+			require.Equal(t, [8]byte(stdDecoded[:8]), extractor.Extract(testString))


Suggested change

require.Equal(t, [8]byte(stdDecoded[:8]), extractor.Extract(testString))

require.Equal(t, [discriminatorLength]byte(stdDecoded[:discriminatorLength]), extractor.Extract(testString))

reductionista · 2025-02-07T17:30:43Z

pkg/solana/logpoller/filters.go

 		refcount--
 		if refcount > 0 {
-			fl.knownDiscriminators[discriminator] = refcount
+			fl.knownDiscriminators[filter.EventSig] = refcount


If we're renaming filter.DiscriminatorRawBytes() to filter.EventSig, shouldn't we also rename fl.knownDiscriminators to fl.knownEventSigs?

reductionista · 2025-02-07T17:48:53Z

pkg/solana/logpoller/log_poller.go

-	if txIndex > 0 && txIndex < math.MaxInt32 && txLogIndex < math.MaxUint32 {
-		return int64(txIndex<<32) | int64(txLogIndex), nil
+	if txIndex >= 0 && txIndex < math.MaxInt32 && txLogIndex < math.MaxUint32 {
+		return int64(txIndex<<32) | int64(txLogIndex), nil //nolint:gosec


Weird, was the linter not complaining about this before and it just started?

reductionista · 2025-02-07T18:07:15Z

pkg/solana/logpoller/types.go

+			result := make([]byte, v.Len())
+			l := v.Len()


nit

Suggested change

result := make([]byte, v.Len())

l := v.Len()

l := v.Len()

result := make([]byte, l)

reductionista · 2025-02-07T18:53:29Z

pkg/solana/logpoller/types.go

@@ -240,7 +253,15 @@ func newIndexedValue(typedVal any) (iVal IndexedValue, err error) {
 	// any length array is fine as long as the element type is byte
 	if t := v.Type(); t.Kind() == reflect.Array {
 		if t.Elem().Kind() == reflect.Uint8 {
-			return v.Bytes(), nil
+			if v.CanAddr() {


Wow, interesting! Had to read up on this a bit just now to understand why this is necessary, but I think I get it.

reductionista · 2025-02-07T19:00:18Z

Just had a few minor cosmetic suggestions, but I'll leave it up to you whether or not they're worth taking since we're on a tight schedule.

cl-sonarqube-production · 2025-02-07T19:13:28Z

Quality Gate failed

Failed conditions
0.0% Coverage on New Code (required ≥ 75%)

See analysis details on SonarQube

dhaidashenko added 3 commits February 6, 2025 18:31

Make work with EventSignatures & Discriminator consistent

942f1da

Ensure get block job is canceled in case of an error

4ad5f72

Support non addressable arrays in IndexedValue

0aedb57

dhaidashenko requested a review from a team as a code owner February 6, 2025 17:34

dhaidashenko requested review from ilija42, reductionista and EasterTheBunny and removed request for ilija42 and reductionista February 6, 2025 17:34

dhaidashenko temporarily deployed to integration February 6, 2025 17:34 — with GitHub Actions Inactive

dhaidashenko temporarily deployed to integration February 6, 2025 17:35 — with GitHub Actions Inactive

dhaidashenko had a problem deploying to integration February 6, 2025 17:40 — with GitHub Actions Failure

Fix log

2e217cd

dhaidashenko had a problem deploying to integration February 6, 2025 18:49 — with GitHub Actions Error

dhaidashenko temporarily deployed to integration February 6, 2025 18:49 — with GitHub Actions Inactive

dhaidashenko had a problem deploying to integration February 6, 2025 18:50 — with GitHub Actions Error

fix linter

39491b9

dhaidashenko temporarily deployed to integration February 6, 2025 18:51 — with GitHub Actions Inactive

dhaidashenko had a problem deploying to integration February 6, 2025 18:51 — with GitHub Actions Error

dhaidashenko had a problem deploying to integration February 6, 2025 18:52 — with GitHub Actions Error

revert hardcoding from per test

ff42fa4

dhaidashenko temporarily deployed to integration February 6, 2025 18:53 — with GitHub Actions Inactive

dhaidashenko had a problem deploying to integration February 6, 2025 18:53 — with GitHub Actions Failure

dhaidashenko temporarily deployed to integration February 6, 2025 18:53 — with GitHub Actions Inactive

dhaidashenko commented Feb 6, 2025

View reviewed changes

fix build

6275202

dhaidashenko temporarily deployed to integration February 6, 2025 19:24 — with GitHub Actions Inactive

dhaidashenko had a problem deploying to integration February 6, 2025 19:30 — with GitHub Actions Error

fix discriminator test

4d1d043

dhaidashenko temporarily deployed to integration February 6, 2025 19:35 — with GitHub Actions Inactive

dhaidashenko temporarily deployed to integration February 6, 2025 19:40 — with GitHub Actions Inactive

dhaidashenko requested review from reductionista and ilija42 February 7, 2025 12:08

EasterTheBunny approved these changes Feb 7, 2025

View reviewed changes

reductionista approved these changes Feb 7, 2025

View reviewed changes

Merge branch 'develop' into fix/logpoller-e2e-test-fixes

d8b7bc7

reductionista temporarily deployed to integration February 7, 2025 19:01 — with GitHub Actions Inactive

reductionista had a problem deploying to integration February 7, 2025 19:01 — with GitHub Actions Failure

reductionista temporarily deployed to integration February 7, 2025 19:01 — with GitHub Actions Inactive

toblich approved these changes Feb 7, 2025

View reviewed changes

toblich enabled auto-merge (squash) February 7, 2025 19:03

reductionista temporarily deployed to integration February 7, 2025 19:10 — with GitHub Actions Inactive

toblich merged commit 6e6a2f9 into develop Feb 7, 2025
35 of 36 checks passed

toblich deleted the fix/logpoller-e2e-test-fixes branch February 7, 2025 19:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LogPoller e2e test fixes #1046

LogPoller e2e test fixes #1046

dhaidashenko commented Feb 6, 2025 •

edited by ilija42

Loading

dhaidashenko Feb 6, 2025

reductionista Feb 7, 2025

reductionista Feb 7, 2025

reductionista Feb 7, 2025

reductionista Feb 7, 2025

reductionista Feb 7, 2025

reductionista commented Feb 7, 2025 •

edited

Loading

cl-sonarqube-production bot commented Feb 7, 2025

	require.Equal(t, [8]byte(stdDecoded[:8]), extractor.Extract(testString))
	require.Equal(t, [discriminatorLength]byte(stdDecoded[:discriminatorLength]), extractor.Extract(testString))

LogPoller e2e test fixes #1046

LogPoller e2e test fixes #1046

Conversation

dhaidashenko commented Feb 6, 2025 • edited by ilija42 Loading

dhaidashenko Feb 6, 2025

Choose a reason for hiding this comment

reductionista Feb 7, 2025

Choose a reason for hiding this comment

reductionista Feb 7, 2025

Choose a reason for hiding this comment

reductionista Feb 7, 2025

Choose a reason for hiding this comment

reductionista Feb 7, 2025

Choose a reason for hiding this comment

reductionista Feb 7, 2025

Choose a reason for hiding this comment

reductionista commented Feb 7, 2025 • edited Loading

cl-sonarqube-production bot commented Feb 7, 2025

Quality Gate failed

dhaidashenko commented Feb 6, 2025 •

edited by ilija42

Loading

reductionista commented Feb 7, 2025 •

edited

Loading