[skip ci]

Signed-off-by: Mic Bowman <mic.bowman@intel.com>
hyperledger-labs · Jun 27, 2023 · 03101b8 · 03101b8
1 parent d1b1f0b
commit 03101b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/docker/tools/run_ccf_tests.sh b/docker/tools/run_ccf_tests.sh
@@ -21,8 +21,8 @@ export PDO_LEDGER_URL="http://${PDO_LEDGER_ADDRESS}:6600"
 source /project/pdo/tools/environment.sh
 source ${PDO_HOME}/bin/lib/common.sh
 
-export no_proxy=$PDO_HOSTNAME,$no_proxy
-export NO_PROXY=$POD_HOSTNAME,$NO_PROXY
+export no_proxy=${PDO_HOSTNAME},$no_proxy,${PDO_LEDGER_ADDRESS}
+export NO_PROXY=${PDO_HOSTNAME},$NO_PROXY,${PDO_LEDGER_ADDRESS}
 
 # this is ridiculous. we need to canonicalize the ledger and
 # sgx keys into the keys directory hierarchy NOT the etc
@@ -40,8 +40,8 @@ mkdir -p ${PDO_LEDGER_KEY_ROOT}
 yell start the ccf service
 # -----------------------------------------------------------------
 . ${PDO_HOME}/ccf/bin/activate
-yell ${PDO_HOME}/ccf/bin/start_ccf_network.sh -i ${PDO_HOSTNAME}
-try ${PDO_HOME}/ccf/bin/start_ccf_network.sh -i ${PDO_HOSTNAME}
+yell ${PDO_HOME}/ccf/bin/start_ccf_network.sh -i ${PDO_LEDGER_ADDRESS}
+try ${PDO_HOME}/ccf/bin/start_ccf_network.sh -i ${PDO_LEDGER_ADDRESS}
 
 # -----------------------------------------------------------------
 yell copy the ledger keys

diff --git a/ledgers/ccf/scripts/register_enclave_attestation_verification_policy.py b/ledgers/ccf/scripts/register_enclave_attestation_verification_policy.py
@@ -55,7 +55,6 @@ def register_enclave_attestation_policy(client, options):
 
 # -----------------------------------------------------------------
 def Main() :
-    default_config = os.path.join(CCF_Etc, 'cchost.toml')
     default_output = os.path.join(CCF_Keys, 'ledger_authority.pem')
 
     parser = argparse.ArgumentParser(description='Fetch the ledger authority key from a CCF server')
@@ -76,7 +75,7 @@ def Main() :
     parser.add_argument('--member-name', help="Name of the user being added", default = "memberccf", type=str)
     parser.add_argument('--port', help='Port where CCF is listening', type=int, default=6600)
 
-    parser.add_argument('--check-attestation', default = False, help="enable attestation verification", action='store_true')
+    parser.add_argument('--check-attestation', default=False, help="enable attestation verification", action='store_true')
     parser.add_argument('--mrenclave', help="Expected MRENCLAVE of pdo enclaves", type=str)
     parser.add_argument('--basename', help="PDO enclave basename", type=str)
     parser.add_argument('--ias-public-key', help="IAS public key derived from cert used to verify report signatures", type=str)

diff --git a/ledgers/ccf/scripts/start_ccf_network.sh b/ledgers/ccf/scripts/start_ccf_network.sh
@@ -94,7 +94,7 @@ cp ${PDO_HOME}/ccf/workspace/sandbox_common/member0_privk.pem ${PDO_LEDGER_KEY_R
 sleep 30
 
 say generate the ledger authority
-${PDO_HOME}/ccf/bin/generate_ledger_authority.py \
+try ${PDO_HOME}/ccf/bin/generate_ledger_authority.py \
     --logfile __screen__ --loglevel WARNING \
     --interface ${F_INTERFACE} --port ${F_PORT}