Skip to content

chore: optimizing delayed strategy logs #549

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
Kammerlo wants to merge 4 commits into
base: release/1.3.0
Choose a base branch
from
+90 −5
Open

chore: optimizing delayed strategy logs #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0032276
chore: optimizing delayed strategy logs
Kammerlo Feb 5, 2026
7298782
chore: adding test for delayed strategy
Kammerlo Feb 5, 2026
c92bb76
chore: spotless
Kammerlo Feb 5, 2026
8d6d578
chore: adjusting logs
Kammerlo Feb 5, 2026
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
10 changes: 5 additions & 5 deletions ...ofoundation/lob/app/blockchain_publisher/service/dispatch/DelayedDispatchingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ public Set<T> apply(String organisationId,
// prioritise expired transactions first since tail may not be even included in the blockchain in this run
return new LinkedHashSet<>(Stream.concat(prioritisedTransactions.stream(), txs.stream()).toList());
}

log.info("Extracted {} passedTransactions for organisationId:{}", txs.size(), organisationId);

if (txs.size() < minTxCount) {
log.warn("Not enough passedTransactions to dispatch for organisationId:{}", organisationId);
if(!txs.isEmpty()) {
log.info("Extracted {} passedTransactions for organisationId:{}", txs.size(), organisationId);
}
if (!txs.isEmpty() && txs.size() < minTxCount) {
log.warn("Not enough passedTransactions to dispatch for organisationId:{}. Got {} need at least {} waiting for more transactions or max delay reached.", organisationId, txs.size(), minTxCount);

return Set.of();
}
Expand Down
85 changes: 85 additions & 0 deletions ...ndation/lob/app/blockchain_publisher/service/dispatch/DelayedDispatchingStrategyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package org.cardanofoundation.lob.app.blockchain_publisher.service.dispatch;

import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import java.time.Clock;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.Set;

import org.springframework.test.util.ReflectionTestUtils;

import org.mockito.junit.jupiter.MockitoExtension;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import org.cardanofoundation.lob.app.blockchain_publisher.domain.entity.txs.TransactionEntity;

@ExtendWith(MockitoExtension.class)
class DelayedDispatchingStrategyTest {

private DelayedDispatchingStrategy<TransactionEntity> strategy;

@BeforeEach
void setUp() {
strategy = new DelayedDispatchingStrategy<>(Clock.fixed(Instant.parse("2026-01-01T00:00:00Z"), ZoneOffset.UTC));
ReflectionTestUtils.setField(strategy, "minTxCount", 2);
ReflectionTestUtils.setField(strategy, "maxTxDelay", Duration.ofHours(1));
}

@Test
void apply_success() {
TransactionEntity mock1 = mock(TransactionEntity.class);
TransactionEntity mock2 = mock(TransactionEntity.class);
TransactionEntity mock3 = mock(TransactionEntity.class);

// all within the delay, but we have more than minTxCount, so all should be included
when(mock1.getCreatedAt()).thenReturn(LocalDateTime.of(2026,1,1, 0,1));
when(mock2.getCreatedAt()).thenReturn(LocalDateTime.of(2026,1,1, 0,2));
when(mock3.getCreatedAt()).thenReturn(LocalDateTime.of(2026,1,1, 0,3));

Set<TransactionEntity> returnTxs = strategy.apply("org1", Set.of(mock1, mock2, mock3));

assertTrue(returnTxs.contains(mock1));
assertTrue(returnTxs.contains(mock2));
assertTrue(returnTxs.contains(mock3));
}

@Test
void apply_prioritisesExpiredTransactions() {
TransactionEntity mock1 = mock(TransactionEntity.class);
TransactionEntity mock2 = mock(TransactionEntity.class);
TransactionEntity mock3 = mock(TransactionEntity.class);

// mock1 is expired, but we have more than minTxCount, so all should be included but mock1 should be prioritised
when(mock1.getCreatedAt()).thenReturn(LocalDateTime.of(2026,1,1, 0,2));
when(mock2.getCreatedAt()).thenReturn(LocalDateTime.of(2026,1,1, 0,3));
when(mock3.getCreatedAt()).thenReturn(LocalDateTime.of(2025,12,31, 22,0));

Set<TransactionEntity> returnTxs = strategy.apply("org1", Set.of(mock1, mock2, mock3));
// Prioritized transaction is first in the returned set
assertTrue(returnTxs.iterator().next() == mock3);
assertTrue(returnTxs.contains(mock1));
assertTrue(returnTxs.contains(mock2));
}

@Test
void apply_notEnoughTransactions() {
TransactionEntity mock1 = mock(TransactionEntity.class);

// mock1 is expired, but we have more than minTxCount, so all should be included but mock1 should be prioritised
when(mock1.getCreatedAt()).thenReturn(LocalDateTime.of(2026,1,1, 0,2));

Set<TransactionEntity> returnTxs = strategy.apply("org1", Set.of(mock1));
// Prioritized transaction is first in the returned set
assertTrue(returnTxs.isEmpty());
}


}