Address review comments

.buildkite/rust/build_runtime.sh

@@ -81,7 +81,7 @@ export KM_ENCLAVE_PATH="$src_dir/target/x86_64-fortanix-unknown-sgx/debug/ekiden
 case $variant in
     elf)
         # Build non-SGX runtime.
-        cargo build --locked -p runtime-ethereum
+        cargo build --locked -p runtime-ethereum -p fuzz
         ;;
     sgxs)
         # Build SGX runtime.

.gitignore

@@ -63,4 +63,4 @@ cobertura.xml
 
 fuzz/Cargo.lock
 fuzz/artifacts
-fuzz/hfuzz_*
+hfuzz_*

Cargo.toml

@@ -80,7 +80,8 @@ heapsize = { git = "https://github.com/oasislabs/heapsize", branch = "sgx-target
 members = [
     "api",
     "common",
+    "fuzz",
     "gateway",
     "genesis",
 ]
-exclude = ["tests", "fuzz"]
+exclude = ["tests"]

fuzz/README.md

@@ -12,7 +12,7 @@ To begin fuzzing,
 1. install the hfuzz [dependencies](https://github.com/rust-fuzz/honggfuzz-rs#dependencies)
 2. `cargo install honggfuzz`
 3. ensure that runtime is buildable (i.e. build or otherwise obtain Ekiden enclaves)
-4. `./run.sh <target name>`
+4. `python3 fuzz.py <target name>`
 
 At the current time, both targets have been fuzzed for over 1m iterations with no crashes found.
 While encouraging, don't let this stop you from trying!

fuzz/fuzz.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+
+import argparse
+import subprocess
+import os
+import os.path as osp
+
+KM_ENV = 'KM_ENCLAVE_PATH'
+RUSTFLAGS_ENV = 'RUSTFLAGS'
+REPO_ROOT = osp.abspath(osp.join(osp.dirname(__file__), '..'))
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('target', help='The name of the fuzz target to run')
+    args = parser.parse_args()
+    run(f'cargo hfuzz run {args.target}')
+
+
+def run(cmd):
+    env = dict(os.environ)
+    if KM_ENV not in env:
+        env[KM_ENV] = osp.join(REPO_ROOT, '.ekiden', 'target',
+                               'x86_64-fortanix-unknown-sgx', 'debug',
+                               'ekiden-keymanager-runtime.sgxs')
+    subprocess.run(cmd, env=env, cwd=REPO_ROOT, shell=True, check=True)
+
+
+if __name__ == '__main__':
+    main()