Skip to content

Commit f5de4f1

Browse files
authored
Allow null callback data when finalizing a task (#158)
1 parent bf467ad commit f5de4f1

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44

55
## [[NEXT]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/vNEXT) 2024
66

7+
### Bug Fixes
8+
9+
- Allow null callback data when finalizing a task. (#158)
10+
711
### Quality
812

913
- Use poco-chain with poco v5.5.0 and voucher v1.0.0 in tests. (#152)

src/main/java/com/iexec/blockchain/command/task/finalize/TaskFinalizeService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public TaskFinalizeService(
3535
}
3636

3737
public String start(final String chainTaskId, final String resultLink, final String callbackData) {
38-
if (!isByte32(chainTaskId) || resultLink == null || callbackData == null) {
39-
log.error("At least one bad args [chainTaskId:{}, resultLink:{}, callbackData:{}]",
40-
chainTaskId, resultLink, callbackData);
38+
// callbackData can be null at the moment
39+
if (!isByte32(chainTaskId) || resultLink == null) {
40+
log.error("At least one bad args [chainTaskId:{}, resultLink:{}]", chainTaskId, resultLink);
4141
return "";
4242
}
4343
return startBlockchainCommand(

src/test/java/com/iexec/blockchain/command/task/finalize/TaskFinalizeServiceTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,14 @@ void shouldFinalizeTask() {
6767

6868
@ParameterizedTest
6969
@MethodSource("provideTaskFinalizeBadParameters")
70-
void shouldNotFinalizeTaskWithBadParameters(final String chainTaskId, final String resultLink, final String callbackData) {
71-
assertThat(taskFinalizeService.start(chainTaskId, resultLink, callbackData)).isEmpty();
70+
void shouldNotFinalizeTaskWithBadParameters(final String chainTaskId, final String resultLink) {
71+
assertThat(taskFinalizeService.start(chainTaskId, resultLink, EMPTY_ADDRESS)).isEmpty();
7272
}
7373

7474
private static Stream<Arguments> provideTaskFinalizeBadParameters() {
7575
return Stream.of(
76-
Arguments.of("not-a-task", RESULT_LINK, EMPTY_ADDRESS),
77-
Arguments.of(CHAIN_TASK_ID, null, EMPTY_ADDRESS),
78-
Arguments.of(CHAIN_TASK_ID, RESULT_LINK, null)
76+
Arguments.of("not-a-task", RESULT_LINK),
77+
Arguments.of(CHAIN_TASK_ID, null)
7978
);
8079
}
8180

0 commit comments

Comments
 (0)