From 6b63acc7017cdc617b4dc1add47b46dd6e98e63b Mon Sep 17 00:00:00 2001 From: Jamie Hewitt Date: Fri, 2 Dec 2022 16:04:12 +0300 Subject: [PATCH] Updating tests --- src/services/Provider.ts | 2 +- test/integration/CodeExamples.test.ts | 16 ++++++++++++---- test/integration/ComputeFlow.test.ts | 4 ++-- test/integration/PublishFlows.test.ts | 13 +++++++------ .../integration/SimplePublishConsumeFlow.test.ts | 7 ++++--- 5 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/services/Provider.ts b/src/services/Provider.ts index 115132af..5de749ec 100644 --- a/src/services/Provider.ts +++ b/src/services/Provider.ts @@ -123,7 +123,7 @@ export class Provider { */ public async encrypt( data: any, - chainId: string, + chainId: number, providerUri: string, signal?: AbortSignal ): Promise { diff --git a/test/integration/CodeExamples.test.ts b/test/integration/CodeExamples.test.ts index 05cd9b30..b2e6dc80 100644 --- a/test/integration/CodeExamples.test.ts +++ b/test/integration/CodeExamples.test.ts @@ -350,7 +350,11 @@ describe('Marketplace flow tests', async () => { /// ```Typescript ASSET_URL.datatokenAddress = freDatatokenAddress ASSET_URL.nftAddress = freNftAddress - const encryptedFiles = await ProviderInstance.encrypt(ASSET_URL, providerUrl) + const encryptedFiles = await ProviderInstance.encrypt( + ASSET_URL, + DDO.chainId, + providerUrl + ) DDO.services[0].files = await encryptedFiles DDO.services[0].datatokenAddress = freDatatokenAddress @@ -359,7 +363,7 @@ describe('Marketplace flow tests', async () => { /// ```Typescript console.log(`DID: ${DDO.id}`) - const providerResponse = await ProviderInstance.encrypt(DDO, providerUrl) + const providerResponse = await ProviderInstance.encrypt(DDO, DDO.chainId, providerUrl) const encryptedDDO = await providerResponse const metadataHash = getHash(JSON.stringify(DDO)) await nft.setMetadata( @@ -567,13 +571,17 @@ describe('Marketplace flow tests', async () => { /// ```Typescript ASSET_URL.datatokenAddress = dispenserDatatokenAddress ASSET_URL.nftAddress = dispenserNftAddress - const encryptedFiles = await ProviderInstance.encrypt(ASSET_URL, providerUrl) + const encryptedFiles = await ProviderInstance.encrypt( + ASSET_URL, + DDO.chainId, + providerUrl + ) DDO.services[0].files = await encryptedFiles DDO.services[0].datatokenAddress = dispenserDatatokenAddress console.log(`DID: ${DDO.id}`) - const providerResponse = await ProviderInstance.encrypt(DDO, providerUrl) + const providerResponse = await ProviderInstance.encrypt(DDO, DDO.chainId, providerUrl) const encryptedDDO = await providerResponse const metadataHash = getHash(JSON.stringify(DDO)) await nft.setMetadata( diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts index 9bcec9ee..46c3d527 100644 --- a/test/integration/ComputeFlow.test.ts +++ b/test/integration/ComputeFlow.test.ts @@ -276,7 +276,7 @@ async function createAsset( // create the files encrypted string assetUrl.datatokenAddress = datatokenAddressAsset assetUrl.nftAddress = ddo.nftAddress - let providerResponse = await ProviderInstance.encrypt(assetUrl, providerUrl) + let providerResponse = await ProviderInstance.encrypt(assetUrl, chain, providerUrl) ddo.services[0].files = await providerResponse ddo.services[0].datatokenAddress = datatokenAddressAsset ddo.services[0].serviceEndpoint = providerUrl @@ -284,7 +284,7 @@ async function createAsset( ddo.nftAddress = web3.utils.toChecksumAddress(nftAddress) ddo.id = 'did:op:' + SHA256(web3.utils.toChecksumAddress(nftAddress) + chain.toString(10)) - providerResponse = await ProviderInstance.encrypt(ddo, providerUrl) + providerResponse = await ProviderInstance.encrypt(ddo, chain, providerUrl) const encryptedResponse = await providerResponse const validateResult = await aquarius.validate(ddo) assert(validateResult.valid, 'Could not validate metadata') diff --git a/test/integration/PublishFlows.test.ts b/test/integration/PublishFlows.test.ts index 7fe324d8..324e92fe 100644 --- a/test/integration/PublishFlows.test.ts +++ b/test/integration/PublishFlows.test.ts @@ -146,14 +146,14 @@ describe('Publish tests', async () => { const datatokenAddress = bundleNFT.events.TokenCreated.returnValues[0] assetUrl.datatokenAddress = datatokenAddress assetUrl.nftAddress = nftAddress - const encryptedFiles = await ProviderInstance.encrypt(assetUrl, providerUrl) + const chain = await web3.eth.getChainId() + const encryptedFiles = await ProviderInstance.encrypt(assetUrl, chain, providerUrl) fixedPriceDdo.metadata.name = 'test-dataset-fixedPrice' fixedPriceDdo.services[0].files = await encryptedFiles fixedPriceDdo.services[0].datatokenAddress = datatokenAddress fixedPriceDdo.nftAddress = nftAddress - const chain = await web3.eth.getChainId() fixedPriceDdo.chainId = chain fixedPriceDdo.id = 'did:op:' + SHA256(web3.utils.toChecksumAddress(nftAddress) + chain.toString(10)) @@ -161,7 +161,7 @@ describe('Publish tests', async () => { const isAssetValid: ValidateMetadata = await aquarius.validate(fixedPriceDdo) assert(isAssetValid.valid === true, 'Published asset is not valid') - const encryptedDdo = await ProviderInstance.encrypt(fixedPriceDdo, providerUrl) + const encryptedDdo = await ProviderInstance.encrypt(fixedPriceDdo, chain, providerUrl) const encryptedResponse = await encryptedDdo const metadataHash = getHash(JSON.stringify(fixedPriceDdo)) // this is publishing with an explicit empty metadataProofs @@ -221,13 +221,14 @@ describe('Publish tests', async () => { const datatokenAddress = bundleNFT.events.TokenCreated.returnValues[0] assetUrl.datatokenAddress = datatokenAddress assetUrl.nftAddress = nftAddress - const encryptedFiles = await ProviderInstance.encrypt(assetUrl, providerUrl) + const chain = await web3.eth.getChainId() + + const encryptedFiles = await ProviderInstance.encrypt(assetUrl, chain, providerUrl) dispenserDdo.metadata.name = 'test-dataset-dispenser' dispenserDdo.services[0].files = await encryptedFiles dispenserDdo.services[0].datatokenAddress = datatokenAddress dispenserDdo.nftAddress = nftAddress - const chain = await web3.eth.getChainId() dispenserDdo.chainId = chain dispenserDdo.id = 'did:op:' + SHA256(web3.utils.toChecksumAddress(nftAddress) + chain.toString(10)) @@ -235,7 +236,7 @@ describe('Publish tests', async () => { const isAssetValid: ValidateMetadata = await aquarius.validate(dispenserDdo) assert(isAssetValid.valid === true, 'Published asset is not valid') - const encryptedDdo = await ProviderInstance.encrypt(dispenserDdo, providerUrl) + const encryptedDdo = await ProviderInstance.encrypt(dispenserDdo, chain, providerUrl) const encryptedResponse = await encryptedDdo const metadataHash = getHash(JSON.stringify(dispenserDdo)) // this is publishing with any explicit metadataProofs diff --git a/test/integration/SimplePublishConsumeFlow.test.ts b/test/integration/SimplePublishConsumeFlow.test.ts index 4b044750..9624dd48 100644 --- a/test/integration/SimplePublishConsumeFlow.test.ts +++ b/test/integration/SimplePublishConsumeFlow.test.ts @@ -148,16 +148,17 @@ describe('Simple Publish & consume test', async () => { // create the files encrypted string assetUrl.datatokenAddress = datatokenAddress assetUrl.nftAddress = nftAddress - let providerResponse = await ProviderInstance.encrypt(assetUrl, providerUrl) + const chain = await web3.eth.getChainId() + + let providerResponse = await ProviderInstance.encrypt(assetUrl, chain, providerUrl) ddo.services[0].files = await providerResponse ddo.services[0].datatokenAddress = datatokenAddress // update ddo and set the right did ddo.nftAddress = nftAddress - const chain = await web3.eth.getChainId() ddo.id = 'did:op:' + SHA256(web3.utils.toChecksumAddress(nftAddress) + chain.toString(10)) - providerResponse = await ProviderInstance.encrypt(ddo, providerUrl) + providerResponse = await ProviderInstance.encrypt(ddo, chain, providerUrl) const encryptedResponse = await providerResponse const metadataHash = getHash(JSON.stringify(ddo)) await nft.setMetadata(