Skip to content
This repository was archived by the owner on Sep 7, 2023. It is now read-only.

Commit

Permalink
fix(build) revert and update bogus version for 0.21
Browse files Browse the repository at this point in the history 
Signed-off-by: Jerome Simeon <[email protected]>
  • Loading branch information
@jeromesimeon
jeromesimeon committed Jul 22, 2020
1 parent b9d5843 commit 802fe63
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 65 deletions.
2 changes: 1 addition & 1 deletion lerna.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"packages": [
"packages/*"
],
"version": null,
"version": "0.20.10",
"hoist": true
}
2 changes: 1 addition & 1 deletion mechanization/Version.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Require Import String.

Section Version.
Definition ergo_version := "null"%string.
Definition ergo_version := "0.21.0"%string.

End Version.

34 changes: 17 additions & 17 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@accordproject/ergo",
"description": "The Ergo Language for Smart Legal Contracts",
"version": null,
"version": "0.20.10",
"scripts": {
"postinstall": "npm run models:get && lerna bootstrap",
"prepare": "npm run pkgcheck",
Expand Down Expand Up @@ -162,4 +162,4 @@
}
},
"dependencies": {}
}
}
2 changes: 1 addition & 1 deletion packages/ergo-cli/extracted/ergoccore.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/ergo-cli/extracted/ergotopcore.js
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/ergo-cli/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/ergo-cli",
"version": null,
"version": "0.20.10",
"description": "Ergo CLI",
"engines": {
"node": ">=8",
Expand Down Expand Up @@ -42,9 +42,9 @@
},
"homepage": "https://www.accordproject.org/projects/ergo",
"dependencies": {
"@accordproject/ergo-compiler": null,
"@accordproject/ergo-engine": null,
"@accordproject/ergo-test": null,
"@accordproject/ergo-compiler": "0.20.10",
"@accordproject/ergo-engine": "0.20.10",
"@accordproject/ergo-test": "0.20.10",
"chalk": "2.4.1",
"jsome": "2.5.0",
"moment-mini": "2.22.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ergo-compiler/extracted/compilercore.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/ergo-compiler/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/ergo-compiler",
"version": null,
"version": "0.20.10",
"description": "Ergo Compiler",
"repository": {
"type": "git",
Expand Down
48 changes: 24 additions & 24 deletions packages/ergo-compiler/test/logicmanager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ describe('LogicManager', () => {
logicManager.compileLogicSync(false);
logicManager.getInvokeCall('helloworld').length.should.equal(250);
logicManager.getDispatchCall().length.should.equal(172);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
});

it('should succeed creating a dispatch call for a JS logic file with a contract class (ES6)', () => {
Expand Down Expand Up @@ -194,9 +194,9 @@ describe('LogicManager', () => {
logicManager.compileLogic(false).then((logicCode) => {
logicManager.getInvokeCall('helloworld').length.should.equal(250);
logicManager.getDispatchCall().length.should.equal(172);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
});
});

Expand All @@ -213,16 +213,16 @@ describe('LogicManager', () => {
logicManager.compileLogicSync(false);
logicManager.getInvokeCall('helloworld').length.should.equal(250);
logicManager.getDispatchCall().length.should.equal(172);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
});

it('should load a logic file (without extension) to the script manager', () => {
const logicManager = new LogicManager('cicero');
logicManager.addLogicFile(ergoSample,'test');
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
});

it('should set the contract name', () => {
Expand All @@ -238,15 +238,15 @@ describe('LogicManager', () => {
logicManager.addLogicFile(ergoSample,'test.ergo');
logicManager.getTarget().should.equal('cicero');
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
logicManager.setTarget('es6', true);
logicManager.getTarget().should.equal('es6');
const contractName = 'org.accordproject.helloemit.HelloWorld';
logicManager.setContractName(contractName);
logicManager.getContractName().should.equal(ErgoCompiler.contractCallName(contractName));
logicManager.getInvokeCall('helloworld').length.should.equal(250);
logicManager.getDispatchCall().length.should.equal(234);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(36709);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(36708);
});

it('should fail to create init and dispatch for ES6 without a contract name', () => {
Expand All @@ -256,37 +256,37 @@ describe('LogicManager', () => {
logicManager.compileLogicSync(false);
logicManager.getInvokeCall('helloworld').length.should.equal(250);
logicManager.getDispatchCall().length.should.equal(234);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(36709);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(36708);
});

it('should set the compilation target to ES6 but not recompile the logic', () => {
const logicManager = new LogicManager('cicero');
logicManager.addLogicFile(ergoSample,'test.ergo');
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
logicManager.setTarget('es6', false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
});

it('should set the compilation target to ES5', () => {
const logicManager = new LogicManager('cicero');
logicManager.addLogicFile(ergoSample,'test.ergo');
logicManager.getTarget().should.equal('cicero');
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
logicManager.setTarget('es5', true);
logicManager.getTarget().should.equal('es5');
logicManager.getInvokeCall('helloworld').length.should.equal(174);
logicManager.getDispatchCall().length.should.equal(158);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(36563);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(36562);
});

it('should fail to create init code for Java', () => {
const logicManager = new LogicManager('java');
logicManager.addLogicFile(ergoSample,'test.ergo');
logicManager.getTarget().should.equal('java');
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(10719);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(10718);
(() => logicManager.getInvokeCall('helloworld')).should.throw('Unsupported target: java');
(() => logicManager.getDispatchCall()).should.throw('Unsupported target: java');
});
Expand All @@ -312,7 +312,7 @@ describe('LogicManager', () => {
'model.cto'
]);
modelManager.getModels()[0].content.length.should.equal(1330);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(45966);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(45965);
});

it('should load a directory with formula', async function () {
Expand All @@ -326,7 +326,7 @@ describe('LogicManager', () => {
'model.cto'
]);
modelManager.getModels()[0].content.length.should.equal(1330);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(40924);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(40923);
});
});

Expand All @@ -343,7 +343,7 @@ describe('LogicManager', () => {
'model.cto'
]);
modelManager.getModels()[0].content.length.should.equal(1330);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(45966);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(45965);
});

it('should load a Zip with formula', async function () {
Expand All @@ -358,7 +358,7 @@ describe('LogicManager', () => {
'model.cto'
]);
modelManager.getModels()[0].content.length.should.equal(1330);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(40924);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(40923);
});
});

Expand All @@ -379,7 +379,7 @@ describe('LogicManager', () => {
'model.cto'
]);
modelManager.getModels()[0].content.length.should.equal(1330);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(45966);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(45965);
});

it('should load a Zip with formula', async function () {
Expand All @@ -398,7 +398,7 @@ describe('LogicManager', () => {
'model.cto'
]);
modelManager.getModels()[0].content.length.should.equal(1330);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(40924);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(40923);
});
});

Expand Down Expand Up @@ -436,15 +436,15 @@ describe('LogicManager', () => {
logicManager.compileLogicSync(false);
logicManager.getInvokeCall('helloworld').length.should.equal(250);
logicManager.getDispatchCall().length.should.equal(172);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
logicManager.updateLogic(ergoSample,'test.ergo');
logicManager.compileLogicSync(false);
logicManager.updateLogic(ergoSample,'testNEW.ergo');
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
logicManager.updateLogic(ergoSample3,'test.ergo');
logicManager.compileLogicSync(false);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38404);
logicManager.getScriptManager().getCompiledScript().getContents().length.should.equal(38403);
});

});
Expand Down
12 changes: 6 additions & 6 deletions packages/ergo-compiler/test/scriptmanager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ describe('ScriptManager', () => {
scriptManager.getLogic().map(x => x.name).should.deep.equal(['test.ergo']);
scriptManager.allFunctionDeclarations().length.should.equal(2);
scriptManager.allFunctionDeclarations().map(x => x.getName()).should.deep.equal(['paymentClause','__dispatch']);
scriptManager.getCompiledScript().getContents().length.should.equal(38404);
scriptManager.getCompiledJavaScript().length.should.equal(38404);
scriptManager.getCompiledScript().getContents().length.should.equal(38403);
scriptManager.getCompiledJavaScript().length.should.equal(38403);
scriptManager.allFunctionDeclarations().length.should.equal(114);
scriptManager.allFunctionDeclarations().filter(x => x.name === '__init').length.should.equal(1);
expect(scriptManager.hasInit()).to.not.throw;
Expand All @@ -76,8 +76,8 @@ describe('ScriptManager', () => {
const script2 = scriptManager.createScript('test.ergo','.ergo',ergoSample);
scriptManager.addScript(script1);
scriptManager.addScript(script2);
scriptManager.compileLogic().getContents().length.should.equal(38404);
scriptManager.getCompiledScript().getContents().length.should.equal(38404);
scriptManager.compileLogic().getContents().length.should.equal(38403);
scriptManager.getCompiledScript().getContents().length.should.equal(38403);
scriptManager.getAllScripts().length.should.equal(3);
});

Expand Down Expand Up @@ -182,8 +182,8 @@ describe('ScriptManager', () => {
const script2 = scriptManager.createScript('test.ergo','.ergo',ergoSample);
scriptManager.addScript(script1);
scriptManager.addScript(script2);
scriptManager.compileLogic().getContents().length.should.equal(38404);
scriptManager.getCompiledJavaScript().length.should.equal(38404);
scriptManager.compileLogic().getContents().length.should.equal(38403);
scriptManager.getCompiledJavaScript().length.should.equal(38403);
scriptManager.clearScripts();
return (() => scriptManager.getCompiledJavaScript()).should.throw('Did not find any compiled JavaScript logic');
});
Expand Down
4 changes: 2 additions & 2 deletions packages/ergo-engine/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/ergo-engine",
"version": null,
"version": "0.20.10",
"description": "Ergo Engine",
"repository": {
"type": "git",
Expand Down Expand Up @@ -33,7 +33,7 @@
"index.browser.js"
],
"dependencies": {
"@accordproject/ergo-compiler": null,
"@accordproject/ergo-compiler": "0.20.10",
"moment-mini": "2.22.1",
"vm2": "3.5.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/ergo-test/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@accordproject/ergo-test",
"version": null,
"version": "0.20.10",
"description": "Ergo Test",
"repository": {
"type": "git",
Expand Down Expand Up @@ -28,8 +28,8 @@
"access": "public"
},
"dependencies": {
"@accordproject/ergo-compiler": null,
"@accordproject/ergo-engine": null,
"@accordproject/ergo-compiler": "0.20.10",
"@accordproject/ergo-engine": "0.20.10",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"chai-things": "0.2.0",
Expand Down

0 comments on commit 802fe63

Please sign in to comment.