(chore) Up Ergo 0.0.61

Signed-off-by: Jerome Simeon <[email protected]>
accordproject · Jun 2, 2018 · 96df8c2 · 96df8c2
1 parent 37f5d33
commit 96df8c2
Show file tree

Hide file tree

Showing 10 changed files with 3,578 additions and 2,289 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cicero-cli/package-lock.json b/packages/cicero-cli/package-lock.json
diff --git a/packages/cicero-cli/package.json b/packages/cicero-cli/package.json
@@ -48,6 +48,7 @@
   "dependencies": {
     "@accordproject/cicero-core": "0.3.15",
     "@accordproject/cicero-engine": "0.3.15",
+    "@accordproject/ergo-compiler": "0.0.61",
     "@accordproject/ergo-compiler": "0.0.48",
     "composer-common": "0.19.6",
     "yargs": "9.0.1"

diff --git a/packages/cicero-cli/test/data/latedeliveryandpenalty/lib/logic.ergo b/packages/cicero-cli/test/data/latedeliveryandpenalty/lib/logic.ergo
@@ -24,7 +24,7 @@ contract LateDeliveryAndPenalty over TemplateModel {
     ;
 
     // Calculate the time difference between current date and agreed upon date
-    define variable diff = momentDiff(now,agreed);
+    define variable diff = momentDiffDays(now,agreed);
     // Penalty formula
     define variable penalty =
       (diff / contract.penaltyDuration.amount) * contract.penaltyPercentage/100.0 * request.goodsValue;

diff --git a/packages/cicero-core/package.json b/packages/cicero-core/package.json
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@accordproject/cicero-common": "0.3.15",
-    "@accordproject/ergo-compiler": "0.0.48",
+    "@accordproject/ergo-compiler": "0.0.61",
     "composer-common": "0.19.6",
     "debug": "2.6.2",
     "glob": "7.1.2",

diff --git a/packages/cicero-core/test/data/latedeliveryandpenalty/lib/logic.ergo b/packages/cicero-core/test/data/latedeliveryandpenalty/lib/logic.ergo
@@ -28,7 +28,7 @@ contract LateDeliveryAndPenalty over TemplateModel {
     ;
 
     // Calculate the time difference between current date and agreed upon date
-    define variable diff = momentDiff(now,agreed);
+    define variable diff = momentDiffDays(now,agreed);
     // Penalty formula
     define variable penalty =
       (diff / contract.penaltyDuration.amount) * contract.penaltyPercentage/100.0 * request.goodsValue;

diff --git a/packages/cicero-core/test/data/mix-logic/lib/logic.ergo b/packages/cicero-core/test/data/mix-logic/lib/logic.ergo
@@ -28,7 +28,7 @@ contract LateDeliveryAndPenalty over TemplateModel {
     ;
 
     // Calculate the time difference between current date and agreed upon date
-    define variable diff = momentDiff(now,agreed);
+    define variable diff = momentDiffDays(now,agreed);
     // Penalty formula
     define variable penalty =
       (diff / contract.penaltyDuration.amount) * contract.penaltyPercentage/100.0 * request.goodsValue;

diff --git a/packages/cicero-engine/test/data/latedeliveryandpenalty/lib/logic.ergo b/packages/cicero-engine/test/data/latedeliveryandpenalty/lib/logic.ergo
@@ -28,7 +28,7 @@ contract LateDeliveryAndPenalty over TemplateModel {
     ;
 
     // Calculate the time difference between current date and agreed upon date
-    define variable diff = momentDiff(now,agreed);
+    define variable diff = momentDiffDays(now,agreed);
     // Penalty formula
     define variable penalty =
       (diff / contract.penaltyDuration.amount) * contract.penaltyPercentage/100.0 * request.goodsValue;

diff --git a/packages/cicero-server/test/data/latedeliveryandpenalty-js/package.json~ b/packages/cicero-server/test/data/latedeliveryandpenalty-js/package.json~
diff --git a/packages/cicero-server/test/data/latedeliveryandpenalty/lib/logic.ergo b/packages/cicero-server/test/data/latedeliveryandpenalty/lib/logic.ergo
@@ -28,7 +28,7 @@ contract LateDeliveryAndPenalty over TemplateModel {
     ;
 
     // Calculate the time difference between current date and agreed upon date
-    define variable diff = momentDiff(now,agreed);
+    define variable diff = momentDiffDays(now,agreed);
     // Penalty formula
     define variable penalty =
       (diff / contract.penaltyDuration.amount) * contract.penaltyPercentage/100.0 * request.goodsValue;