Make validatelargetx test more accurate, reduce block size limit to 1MB for now.

This commit is contained in:
Sean Bowe
2016-07-06 12:07:50 -06:00
parent 2ba9641767
commit 9c45b501ad
5 changed files with 51 additions and 170 deletions

View File

@@ -32,19 +32,6 @@ function zcashd_massif_start {
ZCASHD_PID=$!
}
function zcashd_massif_start_chain {
rm -rf "$DATADIR"
mkdir -p "$DATADIR"
rm -f massif.out
./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 &
ZCASHD_PID=$!
zcashd_generate
zcash_rpc stop > /dev/null
wait $ZCASHD_PID
valgrind --tool=massif --time-unit=ms --massif-out-file=massif.out ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 &
ZCASHD_PID=$!
}
function zcashd_massif_stop {
zcash_rpc stop > /dev/null
wait $ZCASHD_PID
@@ -59,19 +46,6 @@ function zcashd_valgrind_start {
ZCASHD_PID=$!
}
function zcashd_valgrind_start_chain {
rm -rf "$DATADIR"
mkdir -p "$DATADIR"
rm -f valgrind.out
./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 &
ZCASHD_PID=$!
zcashd_generate
zcash_rpc stop > /dev/null
wait $ZCASHD_PID
valgrind --leak-check=yes -v --error-limit=no --log-file="valgrind.out" ./src/zcashd -regtest -datadir="$DATADIR" -rpcuser=user -rpcpassword=password -rpcport=5983 &
ZCASHD_PID=$!
}
function zcashd_valgrind_stop {
zcash_rpc stop > /dev/null
wait $ZCASHD_PID
@@ -102,13 +76,8 @@ case "$1" in
verifyequihash)
zcash_rpc zcbenchmark verifyequihash 1000
;;
createlargetx)
zcashd_generate
zcash_rpc zcbenchmark createlargetx 10
;;
validatelargetx)
zcashd_generate
zcash_rpc zcbenchmark validatelargetx 2
zcash_rpc zcbenchmark validatelargetx 5
;;
*)
zcashd_stop
@@ -118,13 +87,7 @@ case "$1" in
zcashd_stop
;;
memory)
case "$2" in
createlargetx|validatelargetx)
zcashd_massif_start_chain
;;
*)
zcashd_massif_start
esac
zcashd_massif_start
case "$2" in
sleep)
zcash_rpc zcbenchmark sleep 1
@@ -144,12 +107,6 @@ case "$1" in
verifyequihash)
zcash_rpc zcbenchmark verifyequihash 1
;;
createlargetx)
zcash_rpc zcbenchmark validatelargetx 1
;;
validatelargetx)
zcash_rpc zcbenchmark validatelargetx 1
;;
*)
zcashd_massif_stop
echo "Bad arguments."
@@ -159,13 +116,7 @@ case "$1" in
rm -f massif.out
;;
valgrind)
case "$2" in
createlargetx|validatelargetx)
zcashd_valgrind_start_chain
;;
*)
zcashd_valgrind_start
esac
zcashd_valgrind_start
case "$2" in
sleep)
zcash_rpc zcbenchmark sleep 1
@@ -185,12 +136,6 @@ case "$1" in
verifyequihash)
zcash_rpc zcbenchmark verifyequihash 1
;;
createlargetx)
zcash_rpc zcbenchmark validatelargetx 1
;;
validatelargetx)
zcash_rpc zcbenchmark validatelargetx 1
;;
*)
zcashd_valgrind_stop
echo "Bad arguments."