mirror of
https://github.com/oceanprotocol-archive/squid-js.git
synced 2024-02-02 15:31:51 +01:00
remove 0x prefix from serviceAgreementId
This commit is contained in:
parent
09191fab59
commit
a0648b4b84
|
@ -49,7 +49,7 @@ export default class ServiceAgreement extends ContractBase {
|
||||||
|
|
||||||
return this.send("executeAgreement", publisherAddress, [
|
return this.send("executeAgreement", publisherAddress, [
|
||||||
serviceAgreementTemplateId, serviceAgreementSignatureHash, consumerAddress, valueHashes,
|
serviceAgreementTemplateId, serviceAgreementSignatureHash, consumerAddress, valueHashes,
|
||||||
timeoutValues, serviceAgreementId, "0x" + did.replace("did:op:", ""),
|
timeoutValues, "0x" + serviceAgreementId, "0x" + did.replace("did:op:", ""),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,8 +5,4 @@ export default class IdGenerator {
|
||||||
const id = `${v4()}${v4()}`
|
const id = `${v4()}${v4()}`
|
||||||
return id.replace(/-/g, "")
|
return id.replace(/-/g, "")
|
||||||
}
|
}
|
||||||
|
|
||||||
public static generatePrefixedId() {
|
|
||||||
return "0x" + this.generateId()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -158,7 +158,7 @@ export default class Ocean {
|
||||||
|
|
||||||
const ddo = await AquariusProvider.getAquarius().retrieveDDO(did)
|
const ddo = await AquariusProvider.getAquarius().retrieveDDO(did)
|
||||||
const id = did.replace("did:op:", "")
|
const id = did.replace("did:op:", "")
|
||||||
const serviceAgreementId: string = IdGenerator.generatePrefixedId()
|
const serviceAgreementId: string = IdGenerator.generateId()
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const serviceAgreementSignature: string = await ServiceAgreement.signServiceAgreement(id,
|
const serviceAgreementSignature: string = await ServiceAgreement.signServiceAgreement(id,
|
||||||
|
|
|
@ -172,7 +172,7 @@ export default class ServiceAgreement extends OceanBase {
|
||||||
{type: "bytes32[]", value: conditionKeys} as ValuePair,
|
{type: "bytes32[]", value: conditionKeys} as ValuePair,
|
||||||
{type: "bytes32[]", value: valueHashes} as ValuePair,
|
{type: "bytes32[]", value: valueHashes} as ValuePair,
|
||||||
{type: "uint256[]", value: timeouts} as ValuePair,
|
{type: "uint256[]", value: timeouts} as ValuePair,
|
||||||
{type: "bytes32", value: serviceAgreementId} as ValuePair,
|
{type: "bytes32", value: "0x" + serviceAgreementId} as ValuePair,
|
||||||
]
|
]
|
||||||
|
|
||||||
return Web3Provider.getWeb3().utils.soliditySha3(...args).toString("hex")
|
return Web3Provider.getWeb3().utils.soliditySha3(...args).toString("hex")
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import EventListener from "./keeper/EventListener"
|
||||||
import Account from "./ocean/Account"
|
import Account from "./ocean/Account"
|
||||||
import Ocean from "./ocean/Ocean"
|
import Ocean from "./ocean/Ocean"
|
||||||
import ServiceAgreement from "./ocean/ServiceAgreements/ServiceAgreement"
|
import ServiceAgreement from "./ocean/ServiceAgreements/ServiceAgreement"
|
||||||
|
@ -5,7 +6,6 @@ import ServiceAgreementTemplate from "./ocean/ServiceAgreements/ServiceAgreement
|
||||||
import Access from "./ocean/ServiceAgreements/Templates/Access"
|
import Access from "./ocean/ServiceAgreements/Templates/Access"
|
||||||
import FitchainCompute from "./ocean/ServiceAgreements/Templates/FitchainCompute"
|
import FitchainCompute from "./ocean/ServiceAgreements/Templates/FitchainCompute"
|
||||||
import Logger from "./utils/Logger"
|
import Logger from "./utils/Logger"
|
||||||
import EventListener from "./keeper/EventListener"
|
|
||||||
|
|
||||||
const Templates = {Access, FitchainCompute}
|
const Templates = {Access, FitchainCompute}
|
||||||
|
|
||||||
|
|
7
test/TestIdGenerator.ts
Normal file
7
test/TestIdGenerator.ts
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
import IdGenerator from "../src/ocean/IdGenerator"
|
||||||
|
|
||||||
|
export default class TestIdGenerator extends IdGenerator {
|
||||||
|
public static generatePrefixedId() {
|
||||||
|
return "0x" + this.generateId()
|
||||||
|
}
|
||||||
|
}
|
|
@ -85,7 +85,7 @@ describe("Aquarius", () => {
|
||||||
|
|
||||||
it("should store a ddo", async () => {
|
it("should store a ddo", async () => {
|
||||||
|
|
||||||
const did: string = `did:op:${IdGenerator.generatePrefixedId()}`
|
const did: string = `did:op:${IdGenerator.generateId()}`
|
||||||
const ddo: DDO = new DDO({
|
const ddo: DDO = new DDO({
|
||||||
id: did,
|
id: did,
|
||||||
})
|
})
|
||||||
|
@ -103,7 +103,7 @@ describe("Aquarius", () => {
|
||||||
|
|
||||||
it("should store a ddo", async () => {
|
it("should store a ddo", async () => {
|
||||||
|
|
||||||
const did: string = `did:op:${IdGenerator.generatePrefixedId()}`
|
const did: string = `did:op:${IdGenerator.generateId()}`
|
||||||
const ddo: DDO = new DDO({
|
const ddo: DDO = new DDO({
|
||||||
id: did,
|
id: did,
|
||||||
})
|
})
|
||||||
|
|
|
@ -23,31 +23,4 @@ describe("IdGenerator", () => {
|
||||||
assert(id.indexOf("-") === -1)
|
assert(id.indexOf("-") === -1)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe("#generatePrefixedId()", () => {
|
|
||||||
|
|
||||||
it("should generate an id", async () => {
|
|
||||||
|
|
||||||
const id = IdGenerator.generatePrefixedId()
|
|
||||||
assert(id)
|
|
||||||
})
|
|
||||||
|
|
||||||
it("should generate an id that is 64 chars long", async () => {
|
|
||||||
|
|
||||||
const id: string = IdGenerator.generatePrefixedId()
|
|
||||||
assert(id.length === 66, id)
|
|
||||||
})
|
|
||||||
|
|
||||||
it("should be prefixed", async () => {
|
|
||||||
|
|
||||||
const id: string = IdGenerator.generatePrefixedId()
|
|
||||||
assert(id.startsWith("0x"))
|
|
||||||
})
|
|
||||||
|
|
||||||
it("should not contain -", async () => {
|
|
||||||
|
|
||||||
const id: string = IdGenerator.generatePrefixedId()
|
|
||||||
assert(id.indexOf("-") === -1)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
|
@ -60,7 +60,7 @@ describe("ServiceAgreement", () => {
|
||||||
|
|
||||||
const did: string = `did:op:${assetId}`
|
const did: string = `did:op:${assetId}`
|
||||||
const ddo = new DDO({id: did, service: [accessService]})
|
const ddo = new DDO({id: did, service: [accessService]})
|
||||||
const serviceAgreementId: string = IdGenerator.generatePrefixedId()
|
const serviceAgreementId: string = IdGenerator.generateId()
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
||||||
|
@ -80,7 +80,7 @@ describe("ServiceAgreement", () => {
|
||||||
|
|
||||||
const did: string = `did:op:${assetId}`
|
const did: string = `did:op:${assetId}`
|
||||||
const ddo = new DDO({id: did, service: [accessService]})
|
const ddo = new DDO({id: did, service: [accessService]})
|
||||||
const serviceAgreementId: string = IdGenerator.generatePrefixedId()
|
const serviceAgreementId: string = IdGenerator.generateId()
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
||||||
|
@ -104,7 +104,7 @@ describe("ServiceAgreement", () => {
|
||||||
|
|
||||||
const did: string = `did:op:${assetId}`
|
const did: string = `did:op:${assetId}`
|
||||||
const ddo = new DDO({id: did, service: [accessService]})
|
const ddo = new DDO({id: did, service: [accessService]})
|
||||||
const serviceAgreementId: string = IdGenerator.generatePrefixedId()
|
const serviceAgreementId: string = IdGenerator.generateId()
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
||||||
|
@ -128,7 +128,7 @@ describe("ServiceAgreement", () => {
|
||||||
|
|
||||||
const did: string = `did:op:${assetId}`
|
const did: string = `did:op:${assetId}`
|
||||||
const ddo = new DDO({id: did, service: [accessService, metaDataService]})
|
const ddo = new DDO({id: did, service: [accessService, metaDataService]})
|
||||||
const serviceAgreementId: string = IdGenerator.generatePrefixedId()
|
const serviceAgreementId: string = IdGenerator.generateId()
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
||||||
|
@ -157,7 +157,7 @@ describe("ServiceAgreement", () => {
|
||||||
|
|
||||||
const did: string = `did:op:${assetId}`
|
const did: string = `did:op:${assetId}`
|
||||||
const ddo = new DDO({id: did, service: [accessService]})
|
const ddo = new DDO({id: did, service: [accessService]})
|
||||||
const serviceAgreementId: string = IdGenerator.generatePrefixedId()
|
const serviceAgreementId: string = IdGenerator.generateId()
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
||||||
|
@ -187,7 +187,7 @@ describe("ServiceAgreement", () => {
|
||||||
|
|
||||||
const did: string = `did:op:${assetId}`
|
const did: string = `did:op:${assetId}`
|
||||||
const ddo = new DDO({id: did, service: [accessService]})
|
const ddo = new DDO({id: did, service: [accessService]})
|
||||||
const serviceAgreementId: string = IdGenerator.generatePrefixedId()
|
const serviceAgreementId: string = IdGenerator.generateId()
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
WebServiceConnectorProvider.setConnector(new WebServiceConnectorMock(ddo))
|
||||||
|
|
|
@ -2,13 +2,13 @@ import {assert} from "chai"
|
||||||
import ConfigProvider from "../../src/ConfigProvider"
|
import ConfigProvider from "../../src/ConfigProvider"
|
||||||
import MetaData from "../../src/ddo/MetaData"
|
import MetaData from "../../src/ddo/MetaData"
|
||||||
import Account from "../../src/ocean/Account"
|
import Account from "../../src/ocean/Account"
|
||||||
import IdGenerator from "../../src/ocean/IdGenerator"
|
|
||||||
import Ocean from "../../src/ocean/Ocean"
|
import Ocean from "../../src/ocean/Ocean"
|
||||||
import ServiceAgreementTemplate from "../../src/ocean/ServiceAgreements/ServiceAgreementTemplate"
|
import ServiceAgreementTemplate from "../../src/ocean/ServiceAgreements/ServiceAgreementTemplate"
|
||||||
import Access from "../../src/ocean/ServiceAgreements/Templates/Access"
|
import Access from "../../src/ocean/ServiceAgreements/Templates/Access"
|
||||||
import TemplateBase from "../../src/ocean/ServiceAgreements/Templates/TemplateBase"
|
import TemplateBase from "../../src/ocean/ServiceAgreements/Templates/TemplateBase"
|
||||||
import config from "../config"
|
import config from "../config"
|
||||||
import TestContractHandler from "../keeper/TestContractHandler"
|
import TestContractHandler from "../keeper/TestContractHandler"
|
||||||
|
import TestIdGenerator from "../TestIdGenerator"
|
||||||
|
|
||||||
let ocean: Ocean
|
let ocean: Ocean
|
||||||
let accounts: Account[]
|
let accounts: Account[]
|
||||||
|
@ -27,7 +27,7 @@ describe("ServiceAgreementTemplate", () => {
|
||||||
|
|
||||||
const templateOwner = accounts[0]
|
const templateOwner = accounts[0]
|
||||||
const access: TemplateBase = new Access()
|
const access: TemplateBase = new Access()
|
||||||
access.id = IdGenerator.generatePrefixedId()
|
access.id = TestIdGenerator.generatePrefixedId()
|
||||||
const serviceAgreementTemplate: ServiceAgreementTemplate =
|
const serviceAgreementTemplate: ServiceAgreementTemplate =
|
||||||
new ServiceAgreementTemplate(access)
|
new ServiceAgreementTemplate(access)
|
||||||
assert(serviceAgreementTemplate)
|
assert(serviceAgreementTemplate)
|
||||||
|
@ -44,12 +44,13 @@ describe("ServiceAgreementTemplate", () => {
|
||||||
it("should setup an Access agreement template correctly", async () => {
|
it("should setup an Access agreement template correctly", async () => {
|
||||||
|
|
||||||
const access: TemplateBase = new Access()
|
const access: TemplateBase = new Access()
|
||||||
access.id = IdGenerator.generatePrefixedId()
|
access.id = TestIdGenerator.generatePrefixedId()
|
||||||
const serviceAgreementTemplate: ServiceAgreementTemplate =
|
const serviceAgreementTemplate: ServiceAgreementTemplate =
|
||||||
new ServiceAgreementTemplate(access)
|
new ServiceAgreementTemplate(access)
|
||||||
assert(serviceAgreementTemplate)
|
assert(serviceAgreementTemplate)
|
||||||
|
|
||||||
const conds = await serviceAgreementTemplate.getConditions(new MetaData(), IdGenerator.generatePrefixedId())
|
const conds = await serviceAgreementTemplate.getConditions(new MetaData(),
|
||||||
|
TestIdGenerator.generatePrefixedId())
|
||||||
assert(conds)
|
assert(conds)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -59,7 +60,7 @@ describe("ServiceAgreementTemplate", () => {
|
||||||
|
|
||||||
const publisherAccount = accounts[0]
|
const publisherAccount = accounts[0]
|
||||||
const access: TemplateBase = new Access()
|
const access: TemplateBase = new Access()
|
||||||
access.id = IdGenerator.generatePrefixedId()
|
access.id = TestIdGenerator.generatePrefixedId()
|
||||||
const serviceAgreementTemplate: ServiceAgreementTemplate =
|
const serviceAgreementTemplate: ServiceAgreementTemplate =
|
||||||
new ServiceAgreementTemplate(access)
|
new ServiceAgreementTemplate(access)
|
||||||
assert(serviceAgreementTemplate)
|
assert(serviceAgreementTemplate)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user