Skip to content

Commit 3503caf

Browse files
james-toussaintjames-toussaint
authored
Merge pull request #150 from iExecBlockchainComputing/yet-another-block
Set latestBlock when blockNumber missing in receipt
2 parents 4c84306 + bee42d3 commit 3503caf

File tree

7 files changed

+19
-24
lines changed

7 files changed

+19
-24
lines changed

‎src/main/java/com/iexec/worker/amnesia/AmnesiaRecoveryService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public AmnesiaRecoveryService(CustomFeignClient customFeignClient,
5151
}
5252

5353
public List<String> recoverInterruptedReplicates() {
54-
long lasAvailableBlockNumber = iexecHubService.getLastBlockNumber();
54+
long lasAvailableBlockNumber = iexecHubService.getLatestBlockNumber();
5555
List<InterruptedReplicateModel> interruptedReplicates = customFeignClient.getInterruptedReplicates(
5656
lasAvailableBlockNumber);
5757
List<String> recoveredChainTaskIds = new ArrayList<>();

‎src/main/java/com/iexec/worker/chain/ContributionService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public Optional<ChainReceipt> contribute(ContributionAuthorization contribAuth,
138138
}
139139

140140
ChainReceipt chainReceipt = ChainUtils.buildChainReceipt(contributeResponse.log, contribAuth.getChainTaskId(),
141-
iexecHubService.getLastBlockNumber());
141+
iexecHubService.getLatestBlockNumber());
142142

143143
return Optional.of(chainReceipt);
144144
}

‎src/main/java/com/iexec/worker/chain/IexecHubService.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,8 @@ public boolean hasEnoughGas() {
171171
return web3jService.hasEnoughGas(credentialsService.getCredentials().getAddress());
172172
}
173173

174-
public long getLastBlockNumber() {
175-
try {
176-
return web3j.ethGetBlockByNumber(DefaultBlockParameterName.LATEST, false).send().getBlock().getNumber().longValue();
177-
} catch (IOException e) {
178-
log.error("GetLastBlock failed");
179-
}
180-
return 0;
174+
public long getLatestBlockNumber() {
175+
return web3jService.getLatestBlockNumber();
181176
}
182177

183178
private Boolean isContributionStatusValidOnChain(String chainTaskId, ChainStatus chainContributionStatus) {

‎src/main/java/com/iexec/worker/chain/RevealService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public Optional<ChainReceipt> reveal(String chainTaskId) {
9292
}
9393

9494
ChainReceipt chainReceipt = ChainUtils.buildChainReceipt(revealResponse.log,
95-
chainTaskId, iexecHubService.getLastBlockNumber());
95+
chainTaskId, iexecHubService.getLatestBlockNumber());
9696

9797
return Optional.of(chainReceipt);
9898
}

‎src/main/java/com/iexec/worker/executor/TaskExecutorService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public void contribute(ContributionAuthorization contribAuth) {
202202

203203
Optional<ChainReceipt> oChainReceipt = contributionService.contribute(contribAuth, deterministHash, enclaveSignature);
204204
if (!oChainReceipt.isPresent()) {
205-
ChainReceipt chainReceipt = new ChainReceipt(iexecHubService.getLastBlockNumber(), "");
205+
ChainReceipt chainReceipt = new ChainReceipt(iexecHubService.getLatestBlockNumber(), "");
206206
customFeignClient.updateReplicateStatus(chainTaskId, CONTRIBUTE_FAILED, chainReceipt);
207207
return;
208208
}
@@ -227,7 +227,7 @@ public void reveal(String chainTaskId) {
227227

228228
Optional<ChainReceipt> optionalChainReceipt = revealService.reveal(chainTaskId);
229229
if (!optionalChainReceipt.isPresent()) {
230-
ChainReceipt chainReceipt = new ChainReceipt(iexecHubService.getLastBlockNumber(), "");
230+
ChainReceipt chainReceipt = new ChainReceipt(iexecHubService.getLatestBlockNumber(), "");
231231
customFeignClient.updateReplicateStatus(chainTaskId, REVEAL_FAILED, chainReceipt);
232232
return;
233233
}

‎src/main/java/com/iexec/worker/replicate/ReplicateDemandService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public ReplicateDemandService(TaskExecutorService taskExecutorService,
4545
@Scheduled(fixedRateString = "#{publicConfigurationService.askForReplicatePeriod}")
4646
public void askForReplicate() {
4747
// check if the worker can run a task or not
48-
long lastAvailableBlockNumber = iexecHubService.getLastBlockNumber();
48+
long lastAvailableBlockNumber = iexecHubService.getLatestBlockNumber();
4949
if (!taskExecutorService.canAcceptMoreReplicates() && lastAvailableBlockNumber == 0) {
5050
log.info("The worker is already full, it can't accept more tasks");
5151
return;

‎src/test/java/com/iexec/worker/amnesia/AmnesiaRecoveryServiceTests.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void init() {
5151

5252
@Test
5353
public void shouldNotRecoverSinceNothingToRecover() {
54-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
54+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
5555
when(customFeignClient.getInterruptedReplicates(blockNumber))
5656
.thenReturn(Collections.emptyList());
5757

@@ -62,7 +62,7 @@ public void shouldNotRecoverSinceNothingToRecover() {
6262

6363
@Test
6464
public void shouldRecoverByWaiting() {
65-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
65+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
6666
when(customFeignClient.getInterruptedReplicates(blockNumber))
6767
.thenReturn(getStubInterruptedReplicateList(RecoveryAction.WAIT));
6868

@@ -74,7 +74,7 @@ public void shouldRecoverByWaiting() {
7474

7575
@Test
7676
public void shouldRecoverByComputingAgainWhenResultNotFound() {
77-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
77+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
7878
when(customFeignClient.getInterruptedReplicates(blockNumber))
7979
.thenReturn(getStubInterruptedReplicateList(RecoveryAction.CONTRIBUTE));
8080
when(replicateService.retrieveAvailableReplicateModelFromContribAuth(any()))
@@ -92,7 +92,7 @@ public void shouldRecoverByComputingAgainWhenResultNotFound() {
9292

9393
@Test
9494
public void shouldRecoverByContributingWhenResultFound() {
95-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
95+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
9696
when(customFeignClient.getInterruptedReplicates(blockNumber))
9797
.thenReturn(getStubInterruptedReplicateList(RecoveryAction.CONTRIBUTE));
9898
when(replicateService.retrieveAvailableReplicateModelFromContribAuth(any()))
@@ -110,7 +110,7 @@ public void shouldRecoverByContributingWhenResultFound() {
110110

111111
@Test
112112
public void shouldAbortSinceConsensusReached() {
113-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
113+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
114114
when(customFeignClient.getInterruptedReplicates(blockNumber))
115115
.thenReturn(getStubInterruptedReplicateList(RecoveryAction.ABORT_CONSENSUS_REACHED));
116116

@@ -125,7 +125,7 @@ public void shouldAbortSinceConsensusReached() {
125125

126126
@Test
127127
public void shouldAbortSinceContributionTimeout() {
128-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
128+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
129129
when(customFeignClient.getInterruptedReplicates(blockNumber))
130130
.thenReturn(getStubInterruptedReplicateList(
131131
RecoveryAction.ABORT_CONTRIBUTION_TIMEOUT));
@@ -141,7 +141,7 @@ public void shouldAbortSinceContributionTimeout() {
141141

142142
@Test
143143
public void shouldNotRecoverByRevealingWhenResultNotFound() {
144-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
144+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
145145
when(customFeignClient.getInterruptedReplicates(blockNumber))
146146
.thenReturn(getStubInterruptedReplicateList(RecoveryAction.REVEAL));
147147
when(replicateService.retrieveAvailableReplicateModelFromContribAuth(any()))
@@ -158,7 +158,7 @@ public void shouldNotRecoverByRevealingWhenResultNotFound() {
158158

159159
@Test
160160
public void shouldRecoverByRevealingWhenResultFound() {
161-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
161+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
162162
when(customFeignClient.getInterruptedReplicates(blockNumber))
163163
.thenReturn(getStubInterruptedReplicateList(RecoveryAction.REVEAL));
164164
when(replicateService.retrieveAvailableReplicateModelFromContribAuth(any()))
@@ -176,7 +176,7 @@ public void shouldRecoverByRevealingWhenResultFound() {
176176

177177
@Test
178178
public void shouldNotRecoverByUploadingWhenResultNotFound() {
179-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
179+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
180180
when(customFeignClient.getInterruptedReplicates(blockNumber))
181181
.thenReturn(getStubInterruptedReplicateList(RecoveryAction.UPLOAD_RESULT));
182182
when(replicateService.retrieveAvailableReplicateModelFromContribAuth(any()))
@@ -193,7 +193,7 @@ public void shouldNotRecoverByUploadingWhenResultNotFound() {
193193

194194
@Test
195195
public void shouldRecoverByUploadingWhenResultFound() {
196-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
196+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
197197
when(customFeignClient.getInterruptedReplicates(blockNumber))
198198
.thenReturn(getStubInterruptedReplicateList(RecoveryAction.UPLOAD_RESULT));
199199
when(replicateService.retrieveAvailableReplicateModelFromContribAuth(any()))
@@ -211,7 +211,7 @@ public void shouldRecoverByUploadingWhenResultFound() {
211211

212212
@Test
213213
public void shouldCompleteTask() {
214-
when(iexecHubService.getLastBlockNumber()).thenReturn(blockNumber);
214+
when(iexecHubService.getLatestBlockNumber()).thenReturn(blockNumber);
215215
when(customFeignClient.getInterruptedReplicates(blockNumber))
216216
.thenReturn(getStubInterruptedReplicateList(RecoveryAction.COMPLETE));
217217

0 commit comments

Comments
 (0)