diff --git a/package-lock.json b/package-lock.json index c3c2282e1..eb4fb6ff7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3,31 +3,13 @@ "lockfileVersion": 1, "dependencies": { "@accordproject/ergo-compiler": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@accordproject/ergo-compiler/-/ergo-compiler-0.5.3.tgz", - "integrity": "sha512-o3AT27jERCOKQa2f4TQzxxSwF9q1bwlHtrvuzDXjADLXQYrjagxEsfk7g6mTxE2J9IjGFVV3BpSCYN2tCBs1Cw==", + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/@accordproject/ergo-compiler/-/ergo-compiler-0.5.4.tgz", + "integrity": "sha512-gIZn6Ow+n2IyU5WmtorL9grfIhDJwhQhpTARnxrt3NF92m+TmhbxlEjjaU2zqA8eRLjSSurfrDW2CEpl+iTngQ==", "requires": { "composer-concerto": "0.60.0", - "winston": "^3.1.0", + "winston": "3.1.0", "yargs": "9.0.1" - }, - "dependencies": { - "winston": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.1.0.tgz", - "integrity": "sha512-FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg==", - "requires": { - "async": "^2.6.0", - "diagnostics": "^1.1.1", - "is-stream": "^1.1.0", - "logform": "^1.9.1", - "one-time": "0.0.4", - "readable-stream": "^2.3.6", - "stack-trace": "0.0.x", - "triple-beam": "^1.3.0", - "winston-transport": "^4.2.0" - } - } } }, "@mrmlnc/readdir-enhanced": { diff --git a/packages/cicero-cli/package.json b/packages/cicero-cli/package.json index d7237b11f..60b5b9339 100644 --- a/packages/cicero-cli/package.json +++ b/packages/cicero-cli/package.json @@ -48,7 +48,7 @@ "dependencies": { "@accordproject/cicero-core": "0.9.5", "@accordproject/cicero-engine": "0.9.5", - "@accordproject/ergo-compiler": "0.5.3", + "@accordproject/ergo-compiler": "0.5.4", "composer-concerto": "0.60.0", "uuid": "3.2.1", "yargs": "9.0.1" diff --git a/packages/cicero-cli/test/data/latedeliveryandpenalty/contract.json b/packages/cicero-cli/test/data/latedeliveryandpenalty/contract.json index 38efb763c..468e2d39e 100644 --- a/packages/cicero-cli/test/data/latedeliveryandpenalty/contract.json +++ b/packages/cicero-cli/test/data/latedeliveryandpenalty/contract.json @@ -1 +1 @@ -{"$class":"org.accordproject.latedeliveryandpenalty.TemplateModel","clauseId":"72d93891-f2fb-492b-b6c5-50f568851023","forceMajeure":true,"penaltyDuration":{"$class":"org.accordproject.time.Duration","amount":9,"unit":"days"},"penaltyPercentage":7,"capPercentage":2,"termination":{"$class":"org.accordproject.time.Duration","amount":2,"unit":"weeks"},"fractionalPart":"days"} \ No newline at end of file +{"$class":"org.accordproject.latedeliveryandpenalty.TemplateModel","clauseId":"2a997d12-b5c6-4ff8-b83e-ee72a0d73cae","forceMajeure":true,"penaltyDuration":{"$class":"org.accordproject.time.Duration","amount":9,"unit":"days"},"penaltyPercentage":7,"capPercentage":2,"termination":{"$class":"org.accordproject.time.Duration","amount":2,"unit":"weeks"},"fractionalPart":"days"} \ No newline at end of file diff --git a/packages/cicero-core/package.json b/packages/cicero-core/package.json index decb6655f..ff84a1759 100644 --- a/packages/cicero-core/package.json +++ b/packages/cicero-core/package.json @@ -54,7 +54,7 @@ "webpack-cli": "^3.1.0" }, "dependencies": { - "@accordproject/ergo-compiler": "0.5.3", + "@accordproject/ergo-compiler": "0.5.4", "acorn": "^5.1.2", "axios": "0.17.1", "composer-concerto": "0.60.0", diff --git a/packages/cicero-core/test/script.js b/packages/cicero-core/test/script.js index 40953d74f..3efe32d63 100644 --- a/packages/cicero-core/test/script.js +++ b/packages/cicero-core/test/script.js @@ -43,7 +43,7 @@ describe('Script', () => { const script = new Script(modelManager,'test.ergo','.ergo',ergoSample); script.getName().should.equal('test.ergo'); script.getContents().should.equal(ergoSample); - script.getTokens().length.should.equal(5080); + script.getTokens().length.should.equal(5256); }); it('should fail to instantiate for empty script', async function() {