Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Commit

Permalink
renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
aaitor committed Apr 23, 2020
1 parent b2723ae commit 758e6e4
Show file tree
Hide file tree
Showing 55 changed files with 930 additions and 927 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
run:
- git clone https://github.com/keyko-io/nevermind-tools
- cd nevermind-tools
- export CONTRACTS_VERSION=v0.12.7
- export GATEWAY_VERSION=v0.7.2
- export METADATA_VERSION=v1.0.7
- export EVENTS_HANDLER_VERSION=v0.3.0
# - export CONTRACTS_VERSION=v0.1.2
# - export GATEWAY_VERSION=v0.7.2
# - export METADATA_VERSION=v1.0.7
# - export EVENTS_HANDLER_VERSION=v0.3.0
- sudo bash -x start_nevermind.sh --no-commons --local-spree-node 2>&1 > start_nevermind.log &
- cd ..
- sleep 60
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/release-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Compile
run: |
mvn clean package
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 11

- name: Release Maven package
uses: samuelmeuli/action-maven-publish@v1
with:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
> [keyko.io](https://keyko.io)
![Java Maven CI](https://github.com/keyko-io/nevermind-sdk-java/workflows/Java%20Maven%20CI/badge.svg)
[![javadoc](https://javadoc.io/badge2/io.keyko.ocean/nevermind-sdk-java/javadoc.svg)](https://javadoc.io/doc/io.keyko.ocean/ocean-api-java)
[![javadoc](https://javadoc.io/badge2/io.keyko.nevermind/nevermind-sdk-java/javadoc.svg)](https://javadoc.io/doc/io.keyko.ocean/ocean-api-java)

---

Expand Down Expand Up @@ -103,7 +103,7 @@ And you can instantiate the API with the following lines:

```java
Config config = ConfigFactory.load();
OceanAPI oceanAPI = OceanAPI.getInstance(config);
OceanAPI nevermindAPI = OceanAPI.getInstance(config);
```

Remember that TypeSafe Config allows you to overwrite the values using environment variables or arguments passed to
Expand Down Expand Up @@ -135,14 +135,14 @@ OceanAPI oceanAPIFromProperties = OceanAPI.getInstance(properties);
Once you have initialized the API you can call the methods through their corresponding API class. For instance:

```java
Balance balance = oceanAPI.getAccountsAPI().balance(oceanAPI.getMainAccount());
Balance balance = nevermindAPI.getAccountsAPI().balance(nevermindAPI.getMainAccount());

String filesJson = metadataBase.toJson(metadataBase.base.files);
String did = DID.builder().getHash();
String encryptedDocument = oceanAPI.getSecretStoreAPI().encrypt(did, filesJson, 0);
String encryptedDocument = nevermindAPI.getSecretStoreAPI().encrypt(did, filesJson, 0);

Flowable<OrderResult> response = oceanAPI.getAssetsAPI().order(did, SERVICE_DEFINITION_ID);
boolean result = oceanAPI.getAssetsAPI().consume(orderResult.getServiceAgreementId(), did, SERVICE_DEFINITION_ID, "/tmp");
Flowable<OrderResult> response = nevermindAPI.getAssetsAPI().order(did, SERVICE_DEFINITION_ID);
boolean result = nevermindAPI.getAssetsAPI().consume(orderResult.getServiceAgreementId(), did, SERVICE_DEFINITION_ID, "/tmp");
```

### Using the SDK with the Nevermind Tools
Expand Down Expand Up @@ -171,7 +171,7 @@ If you prefer to deal with this method in a synchronous way, you will need to bl
a response:

```java
Flowable<OrderResult> response = oceanAPI.getAssetsAPI().order(did, SERVICE_DEFINITION_ID);
Flowable<OrderResult> response = nevermindAPI.getAssetsAPI().order(did, SERVICE_DEFINITION_ID);
OrderResult orderResult = response.blockingFirst();
```

Expand Down
24 changes: 12 additions & 12 deletions library.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{
"name": "Keyko Ocean Java API",
"name": "Keyko Nevermind Java API",
"repository": {
"type": "git",
"url": "https://github.com/keyko-io/ocean-api-java.git"
"url": "https://github.com/keyko-io/nevermind-sdk-java.git"
},
"dependencies": [
{
"name": "squid-spec",
"version": "0.4"
"name": "squid",
"version": "0.1"
},
{
"name": "OEP-7",
"version": "0.2"
"name": "did",
"version": "0.1"
},
{
"name": "OEP-8",
"version": "0.4"
"name": "metadata",
"version": "0.1"
},
{
"name": "nevermind-contracts",
"version": "0.12.7"
"version": "0.1.2"
},
{
"name": "metadata",
"version": "1.0.7"
"version": "0.1"
},
{
"name": "gateway",
"version": "0.6.0"
"version": "0.1.0"
},
{
"name": "events-handler",
"version": "0.3.0"
"version": "0.1.0"
}
]
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<web3j.version>4.5.17</web3j.version>
<common-utils.version>0.1.2</common-utils.version>

<nevermind.contracts.version>0.1.0</nevermind.contracts.version>
<nevermind.contracts.version>0.1.2</nevermind.contracts.version>
<ocean.secretstore.version>0.1.4</ocean.secretstore.version>
<eddsa.version>0.3.0</eddsa.version>
<jackson.version>2.9.8</jackson.version>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/keyko/nevermind/api/AccountsAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public interface AccountsAPI {
public Balance balance(Account account) throws EthereumException;

/**
* Requests Ocean Tokens from the OceanMarket Smart Contract
* Requests Ocean Tokens
*
* @param amount the amount of tokens
* @return a TransactionReceipt from the transaction sent to the smart contract
Expand Down

0 comments on commit 758e6e4

Please sign in to comment.