drop the quiet option from the pdo-shell commands

the quiet option was realistically required for every
pdo-shell commands, but was never actually being used.
this removes it from the stock pdo-shell commands.
you can still get results by requesting the results in
a symbol and then echoing the symbol value.

Signed-off-by: Mic Bowman <[email protected]>

Author: cmickeyb

build/opt/pdo/etc/template/site.psh

@@ -20,7 +20,7 @@ if --null "${data}"
 fi
 
 ## load the local database if it exists
-set -q --conditional -s dbfile --state Service EnclaveServiceDatabaseFile
+set --conditional -s dbfile --state Service EnclaveServiceDatabaseFile
 
 ## this returns false of the database file does not exist
 ## we can use this later to save the updates

build/tests/shell-test.psh

@@ -14,8 +14,8 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 
-set -q --conditional -s data -v .
-set -q --conditional -s save -v .
+st --conditional -s data -v .
+st --conditional -s save -v .
 
 ## create an eservice db with the known enclave services
 eservice_db clear
@@ -61,15 +61,15 @@ eservice --group all add --url http://localhost:7102 http://localhost:7103 --nam
 eservice --group all use --name es7104
 
 ## create some contracts
-set -q -s contract1 -r 32
-set -q -s contract2 -r 32
-set -q -s contract3 -r 32
+set -s contract1 -r 32
+set -s contract2 -r 32
+set -s contract3 -r 32
 
 identity -n user1
 create -c mock-contract -s _mock-contract -f ${save}/${contract1}.pdo
-send -q -f ${save}/${contract1}.pdo inc_value
-send -q -f ${save}/${contract1}.pdo inc_value
-send -q -f ${save}/${contract1}.pdo -s value inc_value
+send -f ${save}/${contract1}.pdo inc_value
+send -f ${save}/${contract1}.pdo inc_value
+send -f ${save}/${contract1}.pdo -s value inc_value
 if -e ${value} 3
     echo shell test 1 succeeded
 else
@@ -79,11 +79,11 @@ fi
 
 identity -n user2
 create -c mock-contract -s _mock-contract -p all -e all -f ${save}/${contract2}.pdo
-send -q -f ${save}/${contract2}.pdo --wait inc_value -e http://localhost:7101
-send -q -f ${save}/${contract2}.pdo --wait inc_value -e http://localhost:7102
-send -q -f ${save}/${contract2}.pdo --wait inc_value -e random
-send -q -f ${save}/${contract2}.pdo --wait inc_value -e random
-send -q -f ${save}/${contract2}.pdo get_value -s value
+send -f ${save}/${contract2}.pdo --wait inc_value -e http://localhost:7101
+send -f ${save}/${contract2}.pdo --wait inc_value -e http://localhost:7102
+send -f ${save}/${contract2}.pdo --wait inc_value -e random
+send -f ${save}/${contract2}.pdo --wait inc_value -e random
+send -f ${save}/${contract2}.pdo get_value -s value
 if -e ${value} 4
     echo shell test 2 succeeded
 else
@@ -93,10 +93,10 @@ fi
 
 identity -n user3
 create -c mock-contract -s _mock-contract -p p1 -e e1 -f ${save}/${contract3}.pdo
-send -q -f ${save}/${contract3}.pdo inc_value -s r8 -e preferred
-send -q -f ${save}/${contract3}.pdo inc_value -s r9 -e random
-send -q -f ${save}/${contract3}.pdo inc_value -s r10 -e random
-send -q -f ${save}/${contract3}.pdo get_value -s value
+send -f ${save}/${contract3}.pdo inc_value -s r8 -e preferred
+send -f ${save}/${contract3}.pdo inc_value -s r9 -e random
+send -f ${save}/${contract3}.pdo inc_value -s r10 -e random
+send -f ${save}/${contract3}.pdo get_value -s value
 if -e ${value} 3
     echo shell test 3 succeeded
 else

client/bin/pdo-create.psh

@@ -29,17 +29,17 @@
 ##
 ## $ ./pdo-create.psh -m class <class> -m source <source> -m identity <identity>
 
-set -q --conditional -s data -v .
-set -q --conditional -s save -v .
+set --conditional -s data -v .
+set --conditional -s save -v .
 script -f ${home}/etc/site.psh
 
 ## create a random string that uniquely identifies the contract
 ## that we are going to create
-set -q -s random_id -r 32
+set -s random_id -r 32
 
-set -q --conditional -s psgroup -v default
-set -q --conditional -s esgroup -v default
-set -q --conditional -s pdo_file -v ${save}/${random_id}.pdo
+set --conditional -s psgroup -v default
+set --conditional -s esgroup -v default
+set --conditional -s pdo_file -v ${save}/${random_id}.pdo
 
 ## class
 ## source

client/bin/pdo-invoke.psh

@@ -27,9 +27,9 @@
 ##    identity -- the identity of the contract creator
 ## $ ./pdo-invoke.psh -m contract <contract> -expr <expression> -m identity <identity>
 
-set -q --conditional -s data -v .
-set -q --conditional -s params -v ""
-set -q --conditional -s method -v ""
+set --conditional -s data -v .
+set --conditional -s params -v ""
+set --conditional -s method -v ""
 
 script -f ${home}/etc/site.psh
 
@@ -53,14 +53,15 @@ fi
 trap_error
 
 if -n ${params}
-   send -f ${pdo_file} ${method}
+   send -s _result_ -f ${pdo_file} ${method}
 else
-   send -f ${pdo_file} -p ${params} ${method}
+   send -s _result_ -f ${pdo_file} -p ${params} ${method}
 fi
 
 if -o ${_error_code_} 0
    echo ERROR: ${_error_message_}
    exit -v ${_error_code_}
 fi
 
+echo ${_result_}
 exit

client/pdo/client/controller/commands/contract.py

@@ -32,7 +32,6 @@ def command_contract(state, bindings, pargs) :
     """
 
     parser = argparse.ArgumentParser(prog='contract')
-    parser.add_argument('-q', '--quiet', help='Do not print the result', action='store_true')
     parser.add_argument('-s', '--symbol', help='binding symbol for result', type=str)
     parser.add_argument('-f', '--save-file', help='File where contract data is stored', type=str, required=True)
 
@@ -62,8 +61,6 @@ def command_contract(state, bindings, pargs) :
     if options.command == 'code-nonce' :
         result = contract.contract_code.nonce
 
-    if result and not options.quiet :
-        print(result)
     if result and options.symbol :
         bindings.bind(options.symbol, result)
 

client/pdo/client/controller/commands/eservice_db.py

@@ -35,8 +35,6 @@ def command_eservice_db(state, bindings, pargs) :
     """
 
     parser = argparse.ArgumentParser(prog='eservice_db')
-    parser.add_argument('-q', '--quiet', help='Do not print the result', action='store_true')
-
     subparsers = parser.add_subparsers(dest='command')
 
     add_parser = subparsers.add_parser('add', description='add an eservice to the database')
@@ -111,9 +109,6 @@ def command_eservice_db(state, bindings, pargs) :
         if options.field :
             result = enclave[options.field]
 
-        if not options.quiet :
-            print(json.dumps(result, indent=4, sort_keys=True))
-
         if options.symbol :
             bindings.bind(options.symbol, result)
 

client/pdo/client/controller/commands/ledger.py

@@ -32,7 +32,6 @@ def command_ledger(state, bindings, pargs) :
 
     parser = argparse.ArgumentParser(prog='ledger')
     parser.add_argument('--url', help='URL for the ledger', default=default_ledger_url)
-    parser.add_argument('-q', '--quiet', help='Do not print the result', action='store_true')
     parser.add_argument('-s', '--symbol', help='binding symbol for result', type=str)
 
     subparsers = parser.add_subparsers(dest='command')
@@ -63,9 +62,7 @@ def command_ledger(state, bindings, pargs) :
 
     if options.command == 'ledger-key' :
         result = submitter.get_ledger_info()
-        if result and not options.quiet :
-            print(result)
-        if result and options.symbol :
+        if options.symbol :
             bindings.bind(options.symbol, result)
         return
 
@@ -74,38 +71,30 @@ def command_ledger(state, bindings, pargs) :
         result = submitter.get_enclave_info(options.enclave_id)
         if options.path :
             result = eval(options.path, None, result)
-        if result and not options.quiet :
-            print(result)
-        if result and options.symbol :
+        if options.symbol :
             bindings.bind(options.symbol, json.dumps(result))
         return
 
     if options.command == 'contract-info' :
         result = submitter.get_contract_info(options.contract_id)
         if options.path :
             result = eval(options.path, None, result)
-        if result and not options.quiet :
-            print(result)
-        if result and options.symbol :
+        if options.symbol :
             bindings.bind(options.symbol, json.dumps(result))
         return
 
     if options.command == 'current-state' :
         result = submitter.get_current_state_hash(options.contract_id)
         if options.path :
             result = eval(options.path, None, result)
-        if result and not options.quiet :
-            print(result)
-        if result and options.symbol :
+        if options.symbol :
             bindings.bind(options.symbol, json.dumps(result))
         return
 
     if options.command == 'state-info' :
         result = submitter.get_state_details(options.contract_id, options.state_hash)
         if options.path :
             result = eval(options.path, None, result)
-        if result and not options.quiet :
-            print(result)
-        if result and options.symbol :
+        if options.symbol :
             bindings.bind(options.symbol, json.dumps(result))
         return

client/pdo/client/controller/commands/send.py

@@ -33,7 +33,7 @@
 
 ## -----------------------------------------------------------------
 ## -----------------------------------------------------------------
-def send_to_contract(state, save_file, message, eservice_url=None, quiet=False, wait=False, commit=True) :
+def send_to_contract(state, message, save_file, eservice_url=None, wait=False, commit=True) :
 
     # ---------- load the invoker's keys ----------
     try :
@@ -84,17 +84,8 @@ def send_to_contract(state, save_file, message, eservice_url=None, quiet=False,
         raise Exception('enclave failed to evaluate expression; {0}'.format(str(e)))
 
     if not update_response.status :
-        # not sure if this should throw an exception which would
-        # terminate the script or if it should just return an
-        # empty string that can be tested for later
-        # if not quiet :
-        #     print("FAILED: {0}".format(update_response.invocation_response))
-        # return ''
         raise ValueError(update_response.invocation_response)
 
-    if not quiet :
-        print(update_response.invocation_response)
-
     data_directory = state.get(['Contract', 'DataDirectory'])
     ledger_config = state.get(['Ledger'])
 
@@ -135,7 +126,6 @@ def command_send(state, bindings, pargs) :
     parser.add_argument('-f', '--save-file', help='File where contract data is stored', type=str)
     parser.add_argument('-p', '--positional', help='JSON encoded list of positional parameters', type=invocation_parameter)
     parser.add_argument('-s', '--symbol', help='Save the result in a symbol for later use', type=str)
-    parser.add_argument('-q', '--quiet', help='Do not print the result', action='store_true')
     parser.add_argument('--wait', help='Wait for the transaction to commit', action = 'store_true')
 
     parser.add_argument('-k', '--kwarg',
@@ -174,10 +164,9 @@ def command_send(state, bindings, pargs) :
 
     result = send_to_contract(
         state,
-        options.save_file,
         message,
+        options.save_file,
         eservice_url=options.enclave,
-        quiet=options.quiet,
         wait=options.wait)
     if options.symbol :
         bindings.bind(options.symbol, result)

client/pdo/client/controller/contract_controller.py

@@ -372,13 +372,10 @@ def do_sleep(self, args) :
             pargs = self.__arg_parse__(args)
 
             parser = argparse.ArgumentParser(prog='sleep')
-            parser.add_argument('-q', '--quiet', help='suppress printing the result', action='store_true')
             parser.add_argument('-t', '--time', help='time to sleep', type=int, required=True)
 
             options = parser.parse_args(pargs)
 
-            if not options.quiet :
-                print("Sleeping for {} seconds".format(options.time))
             time.sleep(options.time)
 
         except SystemExit as se :
@@ -398,7 +395,6 @@ def do_parse(self, args) :
             pargs = self.__arg_parse__(args)
 
             parser = argparse.ArgumentParser(prog='parse')
-            parser.add_argument('-q', '--quiet', help='suppress printing the result', action='store_true')
             parser.add_argument('-e', '--expression', help='json expression to parse', type=str, required=True)
             parser.add_argument('-p', '--path', help='path to retrieve within the expression', type=str, required=True)
             parser.add_argument('-s', '--symbol', help='symbol in which to store the result', required=True)
@@ -418,8 +414,6 @@ def do_parse(self, args) :
             value = json.dumps(python_value)
 
             self.bindings.bind(options.symbol,value)
-            if not options.quiet :
-                print("${} = {}".format(options.symbol, value))
 
         except SystemExit as se :
             return self.__arg_error__('parse', args, se.code)
@@ -438,7 +432,6 @@ def do_set(self, args) :
             pargs = self.__arg_parse__(args)
 
             parser = argparse.ArgumentParser(prog='set')
-            parser.add_argument('-q', '--quiet', help='suppress printing the result', action='store_true')
             parser.add_argument('-s', '--symbol', help='symbol in which to store the identifier', required=True)
             parser.add_argument('-c', '--conditional', help='set the value only if it is undefined', action='store_true')
 
@@ -473,8 +466,6 @@ def do_set(self, args) :
                 value = self.state.get(options.state)
 
             self.bindings.bind(options.symbol,value)
-            if not options.quiet :
-                print("${} = {}".format(options.symbol, value))
 
         except SystemExit as se :
             return self.__arg_error__('set', args, se.code)

contracts/auction/scripts/bid.psh

@@ -22,8 +22,8 @@
 ## The maps for "bidkey" and "bidval" must be specified to run this
 ## script.
 
-set -q --conditional -s data -v .
-set -q --conditional -s save -v .
+set --conditional -s data -v .
+set --conditional -s save -v .
 script -f ${path}/init.psh
 
 if --null ${key}