misc

scripts/prove_stdio.sh

@@ -40,7 +40,7 @@ export RAYON_NUM_THREADS=$num_procs
 #export RUST_LOG=trace
 # Script users are running locally, and might benefit from extra perf.
 # See also .cargo/config.toml.
-export RUSTFLAGS='-C target-cpu=native -Z linker-features=-lld'
+#export RUSTFLAGS='-C target-cpu=native -Z linker-features=-lld'
 
 INPUT_FILE=$1
 TEST_ONLY=$2

scripts/test_jerigon.sh

@@ -13,8 +13,8 @@ mkdir -p witnesses
 export RAYON_NUM_THREADS=4
 export TOKIO_WORKER_THREADS=1
 export RUST_BACKTRACE=full
-export RUSTFLAGS='-C target-cpu=native -Zlinker-features=-lld'
-export RUST_MIN_STACK=67108864
+#export RUSTFLAGS='-C target-cpu=native -Zlinker-features=-lld'
+#export RUST_MIN_STACK=67108864
 
 GITHASH=`git rev-parse --short HEAD`
 echo "Testing against jergion, current revision: $GITHASH."
@@ -138,9 +138,9 @@ USEDTOFAIL="
 
 ROUND2="
 664
-665
 667
 670
+665
 "
 
 NOWSUCCESS="
@@ -185,7 +185,7 @@ for BLOCK in $BLOCKS; do
   echo "Testing blocks: $BLOCKS."
   echo "Now testing block $BLOCK .."
   export RUST_LOG=info
-  prove_stdio.sh $WITNESS test_only
+  ./prove_stdio.sh $WITNESS test_only
   EXITCODE=$?
   if [ $EXITCODE -eq 0 ]
   then

zero/src/rpc/jumpdest.rs

@@ -26,7 +26,7 @@ use keccak_hash::keccak;
 use structlogprime::normalize_structlog;
 use tokio::time::timeout;
 use trace_decoder::TxnTrace;
-use tracing::{instrument, trace};
+use tracing::trace;
 
 /// The maximum time we are willing to wait for a structlog before failing over
 /// to simulating the JumpDest analysis.
@@ -98,7 +98,6 @@ fn precompiles() -> &'static HashSet<Address> {
 
 /// Generate at JUMPDEST table by simulating the call stack in EVM,
 /// using a Geth structlog as input.
-// #[instrument]
 pub(crate) fn generate_jumpdest_table(
     tx: &Transaction,
     struct_log: &[StructLog],