fix(ergotop) escaping in string printing

Signed-off-by: Jerome Simeon <jeromesimeon@me.com>

README.md

@@ -68,7 +68,7 @@ ergo <command>
 
 Commands:
   ergo draft       create a contract text from data
-  ergo request     send a request to the contract
+  ergo execute     send a request to the contract
   ergo invoke      invoke a clause of the contract
   ergo initialize  initialize the state for a contract
   ergo compile     compile a contract
@@ -96,12 +96,12 @@ $ ergo initialize --template ./examples/volumediscount --data ./examples/volumed
 06:40:29 - info:
 ```
 
-### Send a request
+### Send a request to a contract
 
 To send a request to a contract:
 
 ```sh
-$ ergo  request --template ./examples/volumediscount --data ./examples/volumediscount/data.json --request ./examples/volumediscount/request.json --state ./examples/volumediscount/state.json
+$ ergo execute --template ./examples/volumediscount --data ./examples/volumediscount/data.json --request ./examples/volumediscount/request.json --state ./examples/volumediscount/state.json
 06:40:01 - info:
 {
   "clause": "orgXaccordprojectXvolumediscountXVolumeDiscount",

examples/helloworld1/data.json

@@ -0,0 +1,4 @@
+{
+  "$class": "org.accordproject.helloworld.TemplateModel",
+  "name": "Fred Blogs"
+}

examples/helloworld/model/model2.cto → examples/helloworld1/model/model.cto

@@ -20,7 +20,6 @@ transaction Request {
 
 transaction Response {
   o String output
-  o Integer number
 }
 
 /**

examples/helloworld1/params.json

@@ -0,0 +1,7 @@
+{
+  "request": {
+    "$class": "org.accordproject.helloworld.Request",
+    "input": "Accord Project"
+  },
+  "hello": "Bonjour,"
+}

examples/helloworld1/request.json

@@ -0,0 +1,4 @@
+{
+    "$class": "org.accordproject.helloworld.Request",
+    "input": "Accord Project"
+}

examples/helloworld1/state.json

@@ -0,0 +1,2 @@
+{ "$class": "org.accordproject.cicero.contract.AccordContractState",
+  "stateId" : "1" }

examples/helloworld4/data.json

@@ -0,0 +1,4 @@
+{
+  "$class": "org.accordproject.helloworld.TemplateModel",
+  "name": "Fred Blogs"
+}

examples/helloworld/logic/logic3a.ergo → examples/helloworld4/model/model.cto

@@ -14,6 +14,25 @@
 
 namespace org.accordproject.helloworld
 
-define function sayhello(name: String, input: String) : String {
-	return "Hello " ++ name ++ " (" ++ input ++ ")"
+transaction Request {
+  o String input
+}
+
+transaction Response {
+  o String output
+}
+
+/**
+ * The template model
+ */
+@AccordTemplateModel("helloworld")
+concept TemplateModel {
+  /**
+   * The name for the clause
+   */
+  o String name
+}
+
+concept TextResponse {
+  o String text
 }

examples/helloworld4/params.json

@@ -0,0 +1,7 @@
+{
+  "request": {
+    "$class": "org.accordproject.helloworld.Request",
+    "input": "Accord Project"
+  },
+  "hello": "Bonjour,"
+}

examples/helloworld4/request.json

@@ -0,0 +1,4 @@
+{
+    "$class": "org.accordproject.helloworld.Request",
+    "input": "Accord Project"
+}

examples/helloworld4/state.json

@@ -0,0 +1,2 @@
+{ "$class": "org.accordproject.cicero.contract.AccordContractState",
+  "stateId" : "1" }

examples/helloworldErr/data.json

@@ -0,0 +1,4 @@
+{
+  "$class": "org.accordproject.helloworld.TemplateModel",
+  "name": "Fred Blogs"
+}

examples/helloworld/logic/logic3b.ergo → examples/helloworldErr/logic/logic.ergo

@@ -17,6 +17,6 @@ namespace org.accordproject.helloworld
 contract HelloWorld over TemplateModel {
   // Simple Clause
   clause helloworld(request : Request) : Response {
-    return Response{ output: sayhello(contract.name,request.input) }
+    return Response{ output: "Hello \"" ++ contract.name ++ "\" (" ++ request.input ++ ")" }
   }
 }

examples/helloworldErr/params.json

@@ -0,0 +1,7 @@
+{
+  "request": {
+    "$class": "org.accordproject.helloworld.Request",
+    "input": "Accord Project"
+  },
+  "hello": "Bonjour,"
+}

examples/helloworldErr/request.json

@@ -0,0 +1,4 @@
+{
+    "$class": "org.accordproject.helloworld.Request",
+    "input": "Accord Project"
+}

examples/helloworldErr/state.json

@@ -0,0 +1,2 @@
+{ "$class": "org.accordproject.cicero.contract.AccordContractState",
+  "stateId" : "1" }

examples/helloworldWarning/data.json

@@ -0,0 +1,4 @@
+{
+  "$class": "org.accordproject.helloworld.TemplateModel",
+  "name": "Fred Blogs"
+}

examples/helloworld/logic/returnstate.ergo → examples/helloworldWarning/model/model.cto

@@ -14,11 +14,25 @@
 
 namespace org.accordproject.helloworld
 
-import org.accordproject.cicero.contract.*
+transaction Request {
+  o String input
+}
+
+transaction Response {
+  o String output
+}
+
+/**
+ * The template model
+ */
+@AccordTemplateModel("helloworld")
+concept TemplateModel {
+  /**
+   * The name for the clause
+   */
+  o String name
+}
 
-contract HelloWorld over TemplateModel {
-  // Simple Clause
-  clause test(request : Request) : AccordContractState {
-    return state
-  }
+concept TextResponse {
+  o String text
 }

examples/helloworldWarning/params.json

@@ -0,0 +1,7 @@
+{
+  "request": {
+    "$class": "org.accordproject.helloworld.Request",
+    "input": "Accord Project"
+  },
+  "hello": "Bonjour,"
+}

examples/helloworldWarning/request.json

@@ -0,0 +1,4 @@
+{
+    "$class": "org.accordproject.helloworld.Request",
+    "input": "Accord Project"
+}

examples/helloworldWarning/state.json

@@ -0,0 +1,2 @@
+{ "$class": "org.accordproject.cicero.contract.AccordContractState",
+  "stateId" : "1" }

mechanization/Common/PrintTypedData.v

@@ -103,7 +103,7 @@ Section PrintTypedData.
       | dfloat f => toString f
       | dbool true => "true"
       | dbool false => "false"
-      | dstring s => jsonify (dstring (js_quote_string s))
+      | dstring s => jsonify (dstring s)
       | dcoll arr =>
         "["
            ++ (String.concat

packages/ergo-cli/index.js

@@ -69,7 +69,7 @@ require('yargs')
                 Logger.error(err.message + '\n' + JSON.stringify(err));
             });
     })
-    .command('request', 'send a request to the contract', (yargs) => {
+    .command('execute', 'send a request to the contract', (yargs) => {
         yargs.demandOption(['data', 'request'], 'Please provide at least the contract data and a request');
         yargs.usage('Usage: $0 request --data [file] --state [file] --request [file] [cto files] [ergo files]');
         yargs.option('data', {
@@ -106,7 +106,7 @@ require('yargs')
         }
 
         // Run contract
-        Commands.request(argv.template, files, { file: argv.data }, argv.state ? { file: argv.state } : null,
+        Commands.execute(argv.template, files, { file: argv.data }, argv.state ? { file: argv.state } : null,
             argv.currentTime, argv.request.map(r => { return { file: r }; }), argv.warnings)
             .then((result) => {
                 Logger.info(JSON.stringify(result));

packages/ergo-cli/lib/commands.js

@@ -94,7 +94,7 @@ class Commands {
      * @param {boolean} warnings whether to print warnings
      * @returns {object} Promise to the result of execution
      */
-    static async request(template,files,contractInput,stateInput,currentTime,requestsInput,warnings) {
+    static async execute(template,files,contractInput,stateInput,currentTime,requestsInput,warnings) {
         try {
             const logicManager = await loadTemplate(template,files);
             const contractJson = getJson(contractInput);