Skip to content

Commit 3951f5f

Browse files
paulo-oceanpaulo-ocean
committed
refactor vars
1 parent dc0f447 commit 3951f5f

5 files changed

Lines changed: 41 additions & 77 deletions

File tree

‎src/cli.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ async function initializeSigner() {
1313
process.exit(1);
1414
}
1515

16+
if (!process.env.NODE_URL) {
17+
console.error(chalk.red("Have you forgot to set env NODE_URL?"));
18+
process.exit(1);
19+
}
20+
1621
const provider = new ethers.providers.JsonRpcProvider(process.env.RPC);
1722
let signer;
1823

‎src/commands.ts‎

Lines changed: 24 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import fs from "fs";
2-
import os from "os";
32
import util from "util";
43
import {
54
createAssetUtil,
@@ -35,39 +34,20 @@ export class Commands {
3534
public config: Config;
3635
public aquarius: Aquarius;
3736
public providerUrl: string;
38-
public macOsProviderUrl: string;
3937
// optional settings for indexing wait time
4038
private indexingParams: IndexerWaitParams;
4139

4240
constructor(signer: Signer, network: string | number, config?: Config) {
4341
this.signer = signer;
4442
this.config = config || new ConfigHelper().getConfig(network);
45-
this.providerUrl = process.env.NODE_URL || process.env.PROVIDER_URL || this.config.providerUri;
43+
this.providerUrl = process.env.NODE_URL;
4644
this.indexingParams = getIndexingWaitSettings();
47-
if (
48-
!process.env.PROVIDER_URL && !process.env.NODE_URL &&
49-
this.config.chainId === 8996 &&
50-
os.type() === "Darwin"
51-
) {
52-
this.macOsProviderUrl = "http://127.0.0.1:8030";
53-
}
45+
5446
console.log("Using Provider :", this.providerUrl);
55-
this.macOsProviderUrl &&
56-
console.log(" -> MacOS provider url :", this.macOsProviderUrl);
57-
if (
58-
!process.env.AQUARIUS_URL && !process.env.NODE_URL &&
59-
this.config.chainId === 8996 &&
60-
os.type() === "Darwin"
61-
) {
62-
this.config.metadataCacheUri = "http://127.0.0.1:5000";
63-
}
64-
this.aquarius = new Aquarius(
65-
process.env.NODE_URL || process.env.AQUARIUS_URL || this.config.metadataCacheUri
66-
);
67-
console.log(
68-
"Using Aquarius :",
69-
process.env.NODE_URL || process.env.AQUARIUS_URL || this.config.metadataCacheUri
70-
);
47+
this.config.metadataCacheUri = this.providerUrl;
48+
49+
this.aquarius = new Aquarius(this.config.metadataCacheUri);
50+
console.log("Using Aquarius :", this.config.metadataCacheUri);
7151
}
7252

7353
public async start() {
@@ -103,7 +83,7 @@ export class Commands {
10383
this.signer,
10484
asset.services[0].files,
10585
asset,
106-
this.providerUrl || this.macOsProviderUrl,
86+
this.providerUrl,
10787
this.config,
10888
this.aquarius,
10989
encryptDDO
@@ -134,7 +114,7 @@ export class Commands {
134114
this.signer,
135115
algoAsset.services[0].files,
136116
algoAsset,
137-
this.providerUrl || this.macOsProviderUrl,
117+
this.providerUrl,
138118
this.config,
139119
this.aquarius,
140120
encryptDDO
@@ -178,7 +158,6 @@ export class Commands {
178158
asset,
179159
this.providerUrl,
180160
this.aquarius,
181-
this.macOsProviderUrl,
182161
encryptDDO
183162
);
184163
console.log("Asset updated. Tx: " + JSON.stringify(updateAssetTx, null, 2));
@@ -206,8 +185,8 @@ export class Commands {
206185
}
207186

208187
const providerURI =
209-
this.macOsProviderUrl && dataDdo.chainId === 8996
210-
? this.macOsProviderUrl
188+
this.providerUrl && dataDdo.chainId === 8996
189+
? this.providerUrl
211190
: dataDdo.services[0].serviceEndpoint;
212191
console.log("Downloading asset using provider: ", providerURI);
213192
const datatoken = new Datatoken(this.signer, this.config.chainId, this.config);
@@ -283,10 +262,10 @@ export class Commands {
283262
console.error("Not all the data ddos are available.");
284263
return;
285264
}
286-
let providerURI = this.macOsProviderUrl || this.providerUrl
265+
let providerURI = this.providerUrl
287266
if(ddos.length > 0) {
288-
providerURI = this.macOsProviderUrl && ddos[0].chainId === 8996
289-
? this.macOsProviderUrl
267+
providerURI = this.providerUrl && ddos[0].chainId === 8996
268+
? this.providerUrl
290269
: ddos[0].services[0].serviceEndpoint;
291270
}
292271

@@ -299,9 +278,7 @@ export class Commands {
299278
return;
300279
}
301280

302-
const computeEnvs = await ProviderInstance.getComputeEnvironments(
303-
this.macOsProviderUrl || this.providerUrl
304-
);
281+
const computeEnvs = await ProviderInstance.getComputeEnvironments(this.providerUrl);
305282

306283
if(!computeEnvs || computeEnvs.length < 1) {
307284
console.error(
@@ -518,10 +495,10 @@ export class Commands {
518495
console.error("Not all the data ddos are available.");
519496
return;
520497
}
521-
let providerURI = this.macOsProviderUrl || this.providerUrl
498+
let providerURI = this.providerUrl
522499
if(ddos.length > 0) {
523-
providerURI = this.macOsProviderUrl && ddos[0].chainId === 8996
524-
? this.macOsProviderUrl
500+
providerURI = this.providerUrl && ddos[0].chainId === 8996
501+
? this.providerUrl
525502
: ddos[0].services[0].serviceEndpoint;
526503
}
527504

@@ -533,9 +510,7 @@ export class Commands {
533510
return;
534511
}
535512

536-
const computeEnvs = await ProviderInstance.getComputeEnvironments(
537-
this.macOsProviderUrl || this.providerUrl
538-
);
513+
const computeEnvs = await ProviderInstance.getComputeEnvironments(this.providerUrl);
539514

540515
if(!computeEnvs || computeEnvs.length < 1) {
541516
console.error(
@@ -658,8 +633,8 @@ export class Commands {
658633
}
659634

660635
const providerURI =
661-
this.macOsProviderUrl && dataDdo.chainId === 8996
662-
? this.macOsProviderUrl
636+
this.providerUrl && dataDdo.chainId === 8996
637+
? this.providerUrl
663638
: dataDdo.services[0].serviceEndpoint;
664639

665640
const jobStatus = await ProviderInstance.computeStop(
@@ -674,9 +649,7 @@ export class Commands {
674649
}
675650

676651
public async getComputeEnvironments() {
677-
const computeEnvs = await ProviderInstance.getComputeEnvironments(
678-
this.macOsProviderUrl || this.providerUrl
679-
);
652+
const computeEnvs = await ProviderInstance.getComputeEnvironments(this.providerUrl);
680653

681654
if(!computeEnvs || computeEnvs.length < 1) {
682655
console.error(
@@ -689,10 +662,7 @@ export class Commands {
689662

690663
public async computeStreamableLogs(args: string[]) {
691664
const jobId = args[0]
692-
const logsResponse = await ProviderInstance.computeStreamableLogs(
693-
this.macOsProviderUrl || this.providerUrl,
694-
this.signer,
695-
jobId,
665+
const logsResponse = await ProviderInstance.computeStreamableLogs(this.providerUrl,this.signer,jobId,
696666
);
697667
console.log('response: ' , logsResponse)
698668

@@ -775,7 +745,6 @@ export class Commands {
775745
asset,
776746
this.providerUrl,
777747
this.aquarius,
778-
this.macOsProviderUrl,
779748
encryptDDO
780749
);
781750
console.log("Successfully updated asset metadata: " + txid);
@@ -839,7 +808,6 @@ export class Commands {
839808
asset,
840809
this.providerUrl,
841810
this.aquarius,
842-
this.macOsProviderUrl,
843811
encryptDDO
844812
);
845813
console.log("Asset updated " + txid);
@@ -864,8 +832,8 @@ export class Commands {
864832
agreementId = args[3];
865833
}
866834
const providerURI =
867-
this.macOsProviderUrl && dataDdo.chainId === 8996
868-
? this.macOsProviderUrl
835+
this.providerUrl && dataDdo.chainId === 8996
836+
? this.providerUrl
869837
: dataDdo.services[0].serviceEndpoint;
870838

871839
const jobStatus = (await ProviderInstance.computeStatus(

‎src/helpers.ts‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export async function createAssetUtil(
111111
owner: Signer,
112112
assetUrl: any,
113113
ddo: any,
114-
providerUrl: string,
114+
oceanNodeUrl: string,
115115
config: Config,
116116
aquariusInstance: Aquarius,
117117
encryptDDO: boolean = true,
@@ -120,7 +120,6 @@ export async function createAssetUtil(
120120
accessListFactory?: string,
121121
allowAccessList?: string,
122122
denyAccessList?: string,
123-
macOsProviderUrl?: string,
124123

125124
) {
126125
const isAddress = typeof templateIDorAddress === 'string'
@@ -144,30 +143,29 @@ export async function createAssetUtil(
144143
await owner.getAddress(),
145144
[await owner.getAddress(), ZERO_ADDRESS]
146145
)
147-
return await createAsset(name, symbol, signer, assetUrl, templateIDorAddress, ddo, encryptDDO, providerUrl || macOsProviderUrl, providerFeeToken, aquariusInstance, accessListFactory, allowAccessList, denyAccessList);
146+
return await createAsset(name, symbol, signer, assetUrl, templateIDorAddress, ddo, encryptDDO, oceanNodeUrl, providerFeeToken, aquariusInstance, accessListFactory, allowAccessList, denyAccessList);
148147
}
149-
return await createAsset(name, symbol, signer, assetUrl, templateIDorAddress, ddo, encryptDDO, providerUrl || macOsProviderUrl, providerFeeToken, aquariusInstance);
148+
return await createAsset(name, symbol, signer, assetUrl, templateIDorAddress, ddo, encryptDDO, oceanNodeUrl, providerFeeToken, aquariusInstance);
150149
}
151150

152151

153152

154153
export async function updateAssetMetadata(
155154
owner: Signer,
156155
updatedDdo: DDO,
157-
providerUrl: string,
156+
oceanNodeUrl: string,
158157
aquariusInstance: Aquarius,
159-
macOsProviderUrl?: string,
160158
encryptDDO: boolean = true
161159
): Promise<any> {
162160
const nft = new Nft(owner, (await owner.provider.getNetwork()).chainId);
163161
let flags;
164162
let metadata;
165-
const validateResult = await aquariusInstance.validate(updatedDdo, owner, providerUrl || macOsProviderUrl);
163+
const validateResult = await aquariusInstance.validate(updatedDdo, owner, oceanNodeUrl);
166164
if (encryptDDO) {
167165
const providerResponse = await ProviderInstance.encrypt(
168166
updatedDdo,
169167
updatedDdo.chainId,
170-
macOsProviderUrl || providerUrl
168+
oceanNodeUrl
171169
);
172170
metadata = await providerResponse;
173171
flags = 2
@@ -183,7 +181,7 @@ export async function updateAssetMetadata(
183181
updatedDdo.nftAddress,
184182
await owner.getAddress(),
185183
0,
186-
providerUrl,
184+
oceanNodeUrl,
187185
"",
188186
ethers.utils.hexlify(flags),
189187
metadata,
@@ -201,7 +199,7 @@ export async function handleComputeOrder(
201199
datatoken: Datatoken,
202200
config: Config,
203201
providerFees: ProviderFees,
204-
providerUrl: string,
202+
oceanNodeUrl: string,
205203
consumeMarkerFee?: ConsumeMarketFee
206204
) {
207205
/* We do have 3 possible situations:
@@ -240,7 +238,7 @@ export async function handleComputeOrder(
240238
payerAccount,
241239
config,
242240
datatoken,
243-
providerUrl,
241+
oceanNodeUrl,
244242
consumerAddress,
245243
consumeMarkerFee,
246244
providerFees
@@ -324,12 +322,7 @@ export function isPrivateIP(ip): boolean {
324322
}
325323

326324
export async function getMetadataURI() {
327-
let metadataURI
328-
if (!process.env.AQUARIUS_URL || (process.env.AQUARIUS_URL && process.env.NODE_URL)) {
329-
metadataURI = process.env.NODE_URL
330-
} else {
331-
metadataURI = process.env.AQUARIUS_URL
332-
}
325+
const metadataURI = process.env.NODE_URL
333326
const parsed = new URL(metadataURI);
334327
let ip = metadataURI // by default
335328
// has port number?

‎test/consumeFlow.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ describe("Ocean CLI Publishing", function() {
5757
process.env.PRIVATE_KEY = "0x1d751ded5a32226054cd2e71261039b65afb9ee1c746d055dd699b1150a5befc";
5858
// Using this account: 0x529043886F21D9bc1AE0feDb751e34265a246e47
5959
process.env.RPC = "http://127.0.0.1:8545";
60-
process.env.AQUARIUS_URL = "http://127.0.0.1:8001";
61-
process.env.PROVIDER_URL = "http://127.0.0.1:8001";
60+
process.env.NODE_URL = "http://127.0.0.1:8001";
6261
process.env.ADDRESS_FILE = path.join(process.env.HOME || "", ".ocean/ocean-contracts/artifacts/address.json");
6362

6463
exec(`npm run cli publish ${metadataFile}`, { cwd: projectRoot }, (error, stdout) => {

‎test/interactivePublishFlow.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ describe("Ocean CLI Interactive Publishing", function() {
1616
it("should publish an asset using 'npm run cli start' interactive flow", function(done) {
1717
process.env.PRIVATE_KEY = "0x1d751ded5a32226054cd2e71261039b65afb9ee1c746d055dd699b1150a5befc";
1818
process.env.RPC = "http://127.0.0.1:8545";
19-
process.env.AQUARIUS_URL = "http://127.0.0.1:8001";
20-
process.env.PROVIDER_URL = "http://127.0.0.1:8001";
19+
process.env.NODE_URL = "http://127.0.0.1:8001";
2120
process.env.ADDRESS_FILE = path.join(process.env.HOME || "", ".ocean/ocean-contracts/artifacts/address.json");
2221

2322
const child = exec(`npm run cli start`, { cwd: projectRoot });

0 commit comments

Comments
 (0)