Skip to content

Commit 112a509

Browse files
jbern0rdjbern0rd
authored
fix: update integration tests after poco-chain upgrade (#186)
1 parent 5da3438 commit 112a509

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

‎src/itest/java/com/iexec/blockchain/IntegrationTests.java‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
import com.iexec.common.sdk.broker.BrokerOrder;
2727
import com.iexec.commons.poco.chain.*;
2828
import com.iexec.commons.poco.eip712.EIP712Domain;
29-
import com.iexec.commons.poco.eip712.entity.EIP712AppOrder;
30-
import com.iexec.commons.poco.eip712.entity.EIP712DatasetOrder;
31-
import com.iexec.commons.poco.eip712.entity.EIP712RequestOrder;
32-
import com.iexec.commons.poco.eip712.entity.EIP712WorkerpoolOrder;
3329
import com.iexec.commons.poco.order.AppOrder;
3430
import com.iexec.commons.poco.order.DatasetOrder;
3531
import com.iexec.commons.poco.order.RequestOrder;
@@ -74,6 +70,7 @@
7470

7571
import static com.iexec.commons.poco.chain.ChainTaskStatus.ACTIVE;
7672
import static com.iexec.commons.poco.chain.ChainTaskStatus.UNSET;
73+
import static com.iexec.commons.poco.chain.Web3jAbstractService.toEthereumAddress;
7774
import static com.iexec.commons.poco.encoding.AssetDataEncoder.*;
7875
import static org.assertj.core.api.Assertions.assertThat;
7976
import static org.awaitility.Awaitility.await;
@@ -89,9 +86,10 @@ class IntegrationTests {
8986
private static final String MONGO_SVC_NAME = "ibaa-blockchain-adapter-mongo";
9087
private static final int MONGO_SVC_PORT = 27017;
9188

92-
private static final String APP_REGISTRY_ADDRESS = "0xd5Fe43e3cDD29812949dc9b368345537D7B73001";
93-
private static final String DATASET_REGISTRY_ADDRESS = "0xf3bd0602fA481230271c5396f146e5695D3750A6";
94-
private static final String WORKERPOOL_REGISTRY_ADDRESS = "0x6Cb57fA761812c34645C945cA89AAe3602D42eD3";
89+
private static final String IEXEC_HUB_ADDRESS = "0xeB196D71Bf359bfDB7Ee54429236A09DBF3966B3";
90+
private static final String APP_REGISTRY_SELECTOR = "0x45b637a9";
91+
private static final String DATASET_REGISTRY_SELECTOR = "0xb1b11d2c";
92+
private static final String WORKERPOOL_REGISTRY_SELECTOR = "0x90a0f546";
9593

9694
public static final String USER = "admin";
9795
public static final String PASSWORD = "whatever";
@@ -110,7 +108,7 @@ class IntegrationTests {
110108
@DynamicPropertySource
111109
static void registerProperties(DynamicPropertyRegistry registry) {
112110
registry.add("chain.id", () -> "65535");
113-
registry.add("chain.hubAddress", () -> "0xc4b11f41746D3Ad8504da5B383E1aB9aa969AbC7");
111+
registry.add("chain.hubAddress", () -> IEXEC_HUB_ADDRESS);
114112
registry.add("chain.nodeAddress", () -> getServiceUrl(
115113
environment.getServiceHost(CHAIN_SVC_NAME, CHAIN_SVC_PORT),
116114
environment.getServicePort(CHAIN_SVC_NAME, CHAIN_SVC_PORT)));
@@ -128,17 +126,24 @@ static void registerProperties(DynamicPropertyRegistry registry) {
128126
private final EIP712Domain domain;
129127
private BlockchainAdapterApiClient appClient;
130128

129+
private final String appRegistryAddress;
130+
private final String datasetRegistryAddress;
131+
private final String workerpoolRegistryAddress;
132+
131133
@Autowired
132134
IntegrationTests(final IexecHubService iexecHubService,
133135
final Web3jService web3jService,
134136
final SignerService signerService,
135137
final BrokerService brokerService,
136-
final ChainConfig chainConfig) {
138+
final ChainConfig chainConfig) throws IOException {
137139
this.iexecHubService = iexecHubService;
138140
this.web3jService = web3jService;
139141
this.signerService = signerService;
140142
this.brokerService = brokerService;
141143
this.domain = new EIP712Domain(chainConfig.getId(), chainConfig.getHubAddress());
144+
this.appRegistryAddress = toEthereumAddress(signerService.sendCall(IEXEC_HUB_ADDRESS, APP_REGISTRY_SELECTOR));
145+
this.datasetRegistryAddress = toEthereumAddress(signerService.sendCall(IEXEC_HUB_ADDRESS, DATASET_REGISTRY_SELECTOR));
146+
this.workerpoolRegistryAddress = toEthereumAddress(signerService.sendCall(IEXEC_HUB_ADDRESS, WORKERPOOL_REGISTRY_SELECTOR));
142147
}
143148

144149
@BeforeEach
@@ -232,21 +237,21 @@ private String triggerDeal(int taskVolume) throws IOException {
232237
Numeric.toHexStringNoPrefix(new byte[32]),
233238
"");
234239
final String appTxHash = signerService.signAndSendTransaction(
235-
nonce, BigInteger.ZERO, APP_REGISTRY_ADDRESS, appTxData);
240+
nonce, BigInteger.ZERO, appRegistryAddress, appTxData);
236241
nonce = nonce.add(BigInteger.ONE);
237242
final String workerpoolTxData = encodeWorkerpool(
238243
signerService.getAddress(),
239244
buildRandomName("pool"));
240245
final String workerpoolTxHash = signerService.signAndSendTransaction(
241-
nonce, BigInteger.ZERO, WORKERPOOL_REGISTRY_ADDRESS, workerpoolTxData);
246+
nonce, BigInteger.ZERO, workerpoolRegistryAddress, workerpoolTxData);
242247
nonce = nonce.add(BigInteger.ONE);
243248
final String datasetTxData = encodeDataset(
244249
signerService.getAddress(),
245250
buildRandomName("data"),
246251
"https://abc.com/def.jpeg",
247252
Numeric.toHexStringNoPrefix(new byte[32]));
248253
final String datasetTxHash = signerService.signAndSendTransaction(
249-
nonce, BigInteger.ZERO, DATASET_REGISTRY_ADDRESS, datasetTxData);
254+
nonce, BigInteger.ZERO, datasetRegistryAddress, datasetTxData);
250255

251256
// Wait for a max of 2 blocks for Transactions to be mined
252257
await().atMost(10, TimeUnit.SECONDS)
@@ -309,8 +314,7 @@ private AppOrder buildAppOrder(String appAddress, int volume) {
309314
.requesterrestrict(BytesUtils.EMPTY_ADDRESS)
310315
.salt(Hash.sha3String(RandomStringUtils.randomAlphanumeric(20)))
311316
.build();
312-
final String sig = signerService.signEIP712Entity(new EIP712AppOrder(domain, appOrder));
313-
return appOrder.withSignature(sig);
317+
return (AppOrder) signerService.signOrderForDomain(appOrder, domain);
314318
}
315319

316320
private WorkerpoolOrder buildWorkerpoolOrder(String workerpoolAddress, int volume) {
@@ -326,8 +330,7 @@ private WorkerpoolOrder buildWorkerpoolOrder(String workerpoolAddress, int volum
326330
.datasetrestrict(BytesUtils.EMPTY_ADDRESS)
327331
.salt(Hash.sha3String(RandomStringUtils.randomAlphanumeric(20)))
328332
.build();
329-
final String sig = signerService.signEIP712Entity(new EIP712WorkerpoolOrder(domain, workerpoolOrder));
330-
return workerpoolOrder.withSignature(sig);
333+
return (WorkerpoolOrder) signerService.signOrderForDomain(workerpoolOrder, domain);
331334
}
332335

333336
private DatasetOrder buildDatasetOrder(String datasetAddress, int volume) {
@@ -341,8 +344,7 @@ private DatasetOrder buildDatasetOrder(String datasetAddress, int volume) {
341344
.requesterrestrict(BytesUtils.EMPTY_ADDRESS)
342345
.salt(Hash.sha3String(RandomStringUtils.randomAlphanumeric(20)))
343346
.build();
344-
final String sig = signerService.signEIP712Entity(new EIP712DatasetOrder(domain, datasetOrder));
345-
return datasetOrder.withSignature(sig);
347+
return (DatasetOrder) signerService.signOrderForDomain(datasetOrder, domain);
346348
}
347349

348350
private RequestOrder buildRequestOrder(
@@ -376,8 +378,7 @@ private RequestOrder buildRequestOrder(
376378
.params(dealParams.toJsonString())
377379
.salt(Hash.sha3String(RandomStringUtils.randomAlphanumeric(20)))
378380
.build();
379-
final String sig = signerService.signEIP712Entity(new EIP712RequestOrder(domain, requestOrder));
380-
return requestOrder.withSignature(sig);
381+
return (RequestOrder) signerService.signOrderForDomain(requestOrder, domain);
381382
}
382383

383384
private void waitStatus(String chainTaskId, ChainTaskStatus statusToWait, int maxAttempts) {

0 commit comments

Comments
 (0)