Merge pull request #91 from iExecBlockchainComputing/bugfix/remove-dataset-package

Remove `com.iexec.blockchain.dataset` package

Author: jbern0rd

CHANGELOG.md

@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 - Fix security rule to access Swagger API. (#79)
 ### Quality
 - Use `testcontainers` in integration tests. (#89)
+- Remove `com.iexec.blockchain.dataset` package and update `feign` client endpoints. (#91)
 ### Dependency Upgrades
 - Upgrade to `feign` 11.10. (#80)
 - Upgrade to `iexec-common` 8.2.0. (#83 #85 #90)

README.md

@@ -25,11 +25,11 @@ To run properly, the iExec Blockchain Adapter API requires:
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_PASSWORD` | Login password of the server. | String | `whatever` |
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_MONGO_HOST` | Mongo server host. Cannot be set with URI. | String | `localhost` |
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_MONGO_PORT` | Mongo server port. Cannot be set with URI. | Positive integer | `13012` |
-| `IEXEC_BLOCKCHAIN_ADAPTER_API_CHAIN_ID` | Chain ID of the blockchain network to connect. | Positive integer | `65535` |
-| `IEXEC_BLOCKCHAIN_ADAPTER_API_NODE_ADDRESS` | URL to connect to the blockchain network. | URL | `http://localhost:8545` |
-| `IEXEC_BLOCKCHAIN_ADAPTER_API_BLOCK_TIME` | In seconds, parameter of the targeted blockchain. | Positive integer | `1` |
-| `IEXEC_BLOCKCHAIN_ADAPTER_API_HUB_ADDRESS` | Proxy contract address to interact with the iExec on-chain protocol. | Ethereum Address | `0xBF6B2B07e47326B7c8bfCb4A5460bef9f0Fd2002` |
-| `IEXEC_BLOCKCHAIN_ADAPTER_API_IS_SIDECHAIN` | Define if iExec on-chain protocol is built on top of token (`false`) or native currency (`true`). | Boolean | `false` |
+| `IEXEC_BLOCKCHAIN_ADAPTER_API_CHAIN_ID` | Chain ID of the blockchain network to connect. | Positive integer | `134` |
+| `IEXEC_BLOCKCHAIN_ADAPTER_API_IS_SIDECHAIN` | Define whether iExec on-chain protocol is built on top of token (`false`) or native currency (`true`). | Boolean | `true` |
+| `IEXEC_BLOCKCHAIN_ADAPTER_API_NODE_ADDRESS` | URL to connect to the blockchain network. | URL | `https://bellecour.iex.ec` |
+| `IEXEC_BLOCKCHAIN_ADAPTER_API_BLOCK_TIME` | Duration between consecutive blocks on the blockchain network, in seconds. | Positive integer | `5` |
+| `IEXEC_BLOCKCHAIN_ADAPTER_API_HUB_ADDRESS` | Proxy contract address to interact with the iExec on-chain protocol. | Ethereum Address | `0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f` |
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_GAS_PRICE_MULTIPLIER` | Transactions will be sent with `networkGasPrice * gasPriceMultiplier`. | Float | `1.0` |
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_GAS_PRICE_CAP` | In Wei, will be used for transactions if `networkGasPrice * gasPriceMultiplier > gasPriceCap`. | Positive integer | `22000000000` |
 | `IEXEC_BLOCKCHAIN_ADAPTER_API_WALLET_PATH` | Path to the wallet of the server. | String | `src/main/resources/wallet.json` |
@@ -48,3 +48,7 @@ No default strategy has been implemented in the [Dockerfile](docker/Dockerfile)
 ## CI/CD build
 
 `docker image build -f docker/Dockerfile .`
+
+## License
+
+This repository code is released under the [Apache License 2.0](LICENSE).

iexec-blockchain-adapter-api-library/src/main/java/com/iexec/blockchain/api/BlockchainAdapterApiClient.java

@@ -16,14 +16,12 @@
 
 package com.iexec.blockchain.api;
 
-import com.iexec.blockchain.tool.Status;
 import com.iexec.common.chain.adapter.CommandStatus;
 import com.iexec.common.chain.adapter.args.TaskContributeArgs;
 import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
 import com.iexec.common.chain.adapter.args.TaskRevealArgs;
 import com.iexec.common.config.PublicChainConfig;
 import com.iexec.common.sdk.broker.BrokerOrder;
-import com.iexec.commons.poco.chain.ChainDataset;
 import com.iexec.commons.poco.chain.ChainTask;
 import feign.Param;
 import feign.RequestLine;
@@ -44,20 +42,6 @@ public interface BlockchainAdapterApiClient {
     @RequestLine("POST /broker/broker/orders/match")
     String matchOrders(BrokerOrder brokerOrder);
 
-    @RequestLine("POST /datasets/requests?name={name}&multiAddress={multiAddress}&checksum={checksum}")
-    String createDataset(@Param("name") String name,
-                         @Param("multiAddress") String multiAddress,
-                         @Param("checksum") String checksum);
-
-    @RequestLine("GET /datasets/requests/{requestId}")
-    String getAddressForCreateDatasetRequest(@Param("requestId") String requestId);
-
-    @RequestLine("GET /datasets/requests/{requestId}/status")
-    Status getStatusForCreateDatasetRequest(@Param("requestId") String requestId);
-
-    @RequestLine("GET /datasets?address={address}")
-    ChainDataset getDatasetByAddress(@Param("address") String address);
-
     @RequestLine("GET /metrics")
     String getMetrics();