Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ipfs CID. #1851

Merged
merged 26 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ jobs:
# needs: [test_unit, test_integration]
# steps:
# - uses: actions/checkout@v3
# - uses: actions/setup-node@v2
# - uses: actions/setup-node@v4
# with:
# node-version: '16'

Expand Down
2 changes: 1 addition & 1 deletion src/services/Provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ export class Provider {
LoggerInstance.error(e)
throw new Error(`Provider initialize failed url: ${initializeUrl} `)
}
if (response?.ok) {
if (response?.status === 200) {
const results: ProviderInitialize = await response.json()
return results
}
Expand Down
71 changes: 46 additions & 25 deletions test/integration/PublishEditConsume.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,6 @@ const arweaveFile: Files = {
]
}

const ifpsFile: Files = {
datatokenAddress: '0x0',
nftAddress: '0x0',
files: [
{
type: 'ipfs',
hash: 'QmRhsp7eghZtW4PktPC2wAHdKoy2LiF1n6UXMKmAhqQJUA'
}
]
}

const onchainFile: Files = {
datatokenAddress: '0x0',
nftAddress: '0x0',
Expand Down Expand Up @@ -146,6 +135,29 @@ function delay(interval: number) {
}).timeout(interval + 100)
}

function uploadToIpfs(data: any): Promise<string> {
return new Promise((resolve, reject) => {
fetch('http://172.15.0.16:5001/api/v0/add', {
method: 'POST',
headers: {
'Content-Type':
'multipart/form-data; boundary=------------------------a28d68b1c872c96f'
},
body:
'--------------------------a28d68b1c872c96f\r\nContent-Disposition: form-data; name="file"; filename="ddo.json"\r\nContent-Type: application/octet-stream\r\n\r\n' +
data +
'\r\n--------------------------a28d68b1c872c96f--\r\n'
})
.then(function (response: any) {
const resp = response.json()
resolve(resp.Hash)
})
.catch(function (error: any) {
reject(error)
})
})
}

describe('Publish consume test', async () => {
before(async () => {
publisherAccount = (await provider.getSigner(0)) as Signer
Expand Down Expand Up @@ -210,33 +222,42 @@ describe('Publish consume test', async () => {
)
assert(urlAssetId, 'Failed to publish url DDO')
})

it('Should publish ipfs asset', async () => {
ipfsAssetId = await createAsset(
'IpfsDatatoken',
'IPFSDT',
it('Should publish arweave asset', async () => {
arweaveAssetId = await createAsset(
'ArwaveDatatoken',
'ARWAVEDT',
publisherAccount,
ifpsFile,
arweaveFile,
assetDdo,
providerUrl,
addresses.ERC721Factory,
aquarius
)
assert(ipfsAssetId, 'Failed to publish ipfs DDO')
assert(arweaveAssetId, 'Failed to arwave publish DDO')
})

it('Should publish arwave asset', async () => {
arweaveAssetId = await createAsset(
'ArweaveDatatoken',
'ARWEAVEDT',
it('Should publish ipfs asset', async () => {
const ipfsCID = await uploadToIpfs(JSON.stringify(assetDdo))
const ipfsFile: Files = {
datatokenAddress: '0x0',
nftAddress: '0x0',
files: [
{
type: 'ipfs',
hash: ipfsCID
}
]
}
ipfsAssetId = await createAsset(
'IpfsDatatoken',
'IPFSDT',
publisherAccount,
arweaveFile,
ipfsFile,
assetDdo,
providerUrl,
addresses.ERC721Factory,
aquarius
)
assert(arweaveAssetId, 'Failed to publish ipfs DDO')
assert(ipfsAssetId, 'Failed to publish ipfs DDO')
})

it('Should publish onchain asset', async () => {
Expand Down
Loading