diff --git a/package-lock.json b/package-lock.json index 6df2735..de9b3f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "e2e" ], "dependencies": { - "@accordproject/cicero-core": "^2.0.0", + "@accordproject/cicero-core": "^2.1.1", "@accordproject/concerto-codegen": "4.1.3", "@accordproject/concerto-core": "4.1.4", "@accordproject/concerto-util": "4.1.4", @@ -101,9 +101,9 @@ "license": "MIT" }, "node_modules/@accordproject/cicero-core": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@accordproject/cicero-core/-/cicero-core-2.0.0.tgz", - "integrity": "sha512-3Hhsxcczwu/3mLfqDnps7lnIJ2P5CUOHN01wk4T71yOmOtdW8ur5MNYOwukBmOdWRs0h7Bh/pSJdcwjOkmnwaA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@accordproject/cicero-core/-/cicero-core-2.1.1.tgz", + "integrity": "sha512-1OkV41WYM7zJhwSjDUOkJfj36OmZNxwEWFATec8Bt2dKKtdijU4T1T/K0M/NriI1W3C/eeSIDTdT/UITzUnvRg==", "license": "Apache-2.0", "dependencies": { "@accordproject/concerto-core": "4.1.4", diff --git a/package.json b/package.json index 9b7499b..af1f762 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "author": "accordproject.org", "license": "Apache-2.0", "dependencies": { - "@accordproject/cicero-core": "^2.0.0", + "@accordproject/cicero-core": "^2.1.1", "@accordproject/concerto-codegen": "4.1.3", "@accordproject/concerto-core": "4.1.4", "@accordproject/concerto-util": "4.1.4", diff --git a/test/TemplateArchiveProcessor.test.ts b/test/TemplateArchiveProcessor.test.ts index 94f3c92..661379c 100644 --- a/test/TemplateArchiveProcessor.test.ts +++ b/test/TemplateArchiveProcessor.test.ts @@ -1,36 +1,10 @@ -import { cpSync, mkdtempSync, readFileSync, writeFileSync } from 'fs'; +import { cpSync, mkdtempSync, writeFileSync } from 'fs'; import os from 'os'; import path from 'path'; import {Template} from '@accordproject/cicero-core'; import { TemplateArchiveProcessor, InitResponse, TriggerResponse } from '../src/TemplateArchiveProcessor'; const TEMPLATE_DIR = 'test/archives/latedeliveryandpenalty-typescript'; -const TEMPLATE_MODEL_DIR = path.join(TEMPLATE_DIR, 'model'); - -function mockArchiveModelFetches() { - const originalFetch = global.fetch.bind(global); - const modelByUrl = new Map([ - ['https://models.accordproject.org/time@0.3.0.cto', readFileSync(path.join(TEMPLATE_MODEL_DIR, '@models.accordproject.org.time@0.3.0.cto'), 'utf-8')], - ['https://models.accordproject.org/accordproject/contract@0.2.0.cto', readFileSync(path.join(TEMPLATE_MODEL_DIR, '@models.accordproject.org.accordproject.contract@0.2.0.cto'), 'utf-8')], - ['https://models.accordproject.org/accordproject/runtime@0.2.0.cto', readFileSync(path.join(TEMPLATE_MODEL_DIR, '@models.accordproject.org.accordproject.runtime@0.2.0.cto'), 'utf-8')] - ]); - - return jest.spyOn(global, 'fetch').mockImplementation(async (input: string | URL | Request, init?: RequestInit) => { - const url = typeof input === 'string' ? input : input instanceof URL ? input.toString() : input.url; - const model = modelByUrl.get(url); - - if (model !== undefined) { - return new Response(model, { - status: 200, - headers: { - 'content-type': 'text/plain' - } - }); - } - - return originalFetch(input, init); - }); -} async function loadTemplate(logicSource?: string): Promise