From b1eec3a5d3af4fb4422ff0a5304de86805e6328e Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Thu, 2 Nov 2017 13:20:14 -0500 Subject: [PATCH] remove test_data/empty_block and test_data/small_blockN --- consensus/test_data/build.sh | 108 ++++++++++++------------- consensus/test_data/empty_block.cswal | Bin 782 -> 0 bytes consensus/test_data/small_block1.cswal | Bin 4041 -> 0 bytes consensus/test_data/small_block2.cswal | Bin 4861 -> 0 bytes 4 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 consensus/test_data/empty_block.cswal delete mode 100644 consensus/test_data/small_block1.cswal delete mode 100644 consensus/test_data/small_block2.cswal diff --git a/consensus/test_data/build.sh b/consensus/test_data/build.sh index dcec6f2a0..6f410c700 100755 --- a/consensus/test_data/build.sh +++ b/consensus/test_data/build.sh @@ -52,19 +52,19 @@ function reset(){ reset -function empty_block(){ - echo "==> Starting tendermint..." - tendermint node --proxy_app=persistent_dummy &> /dev/null & - sleep 5 - echo "==> Killing tendermint..." - killall tendermint +# function empty_block(){ +# echo "==> Starting tendermint..." +# tendermint node --proxy_app=persistent_dummy &> /dev/null & +# sleep 5 +# echo "==> Killing tendermint..." +# killall tendermint - echo "==> Copying WAL log..." - $cutWALUntil "$TMHOME/data/cs.wal/wal" 1 consensus/test_data/new_empty_block.cswal - mv consensus/test_data/new_empty_block.cswal consensus/test_data/empty_block.cswal +# echo "==> Copying WAL log..." +# $cutWALUntil "$TMHOME/data/cs.wal/wal" 1 consensus/test_data/new_empty_block.cswal +# mv consensus/test_data/new_empty_block.cswal consensus/test_data/empty_block.cswal - reset -} +# reset +# } function many_blocks(){ bash scripts/txs/random.sh 1000 36657 &> /dev/null & @@ -84,63 +84,63 @@ function many_blocks(){ } -function small_block1(){ - bash scripts/txs/random.sh 1000 36657 &> /dev/null & - PID=$! - echo "==> Starting tendermint..." - tendermint node --proxy_app=persistent_dummy &> /dev/null & - sleep 10 - echo "==> Killing tendermint..." - kill -9 $PID - killall tendermint +# function small_block1(){ +# bash scripts/txs/random.sh 1000 36657 &> /dev/null & +# PID=$! +# echo "==> Starting tendermint..." +# tendermint node --proxy_app=persistent_dummy &> /dev/null & +# sleep 10 +# echo "==> Killing tendermint..." +# kill -9 $PID +# killall tendermint - echo "==> Copying WAL log..." - $cutWALUntil "$TMHOME/data/cs.wal/wal" 1 consensus/test_data/new_small_block1.cswal - mv consensus/test_data/new_small_block1.cswal consensus/test_data/small_block1.cswal +# echo "==> Copying WAL log..." +# $cutWALUntil "$TMHOME/data/cs.wal/wal" 1 consensus/test_data/new_small_block1.cswal +# mv consensus/test_data/new_small_block1.cswal consensus/test_data/small_block1.cswal - reset -} +# reset +# } -# block part size = 512 -function small_block2(){ - cat "$TMHOME/genesis.json" | jq '. + {consensus_params: {block_size_params: {max_bytes: 22020096}, block_gossip_params: {block_part_size_bytes: 512}}}' > "$TMHOME/new_genesis.json" - mv "$TMHOME/new_genesis.json" "$TMHOME/genesis.json" - bash scripts/txs/random.sh 1000 36657 &> /dev/null & - PID=$! - echo "==> Starting tendermint..." - tendermint node --proxy_app=persistent_dummy &> /dev/null & - sleep 5 - echo "==> Killing tendermint..." - kill -9 $PID - killall tendermint +# # block part size = 512 +# function small_block2(){ +# cat "$TMHOME/genesis.json" | jq '. + {consensus_params: {block_size_params: {max_bytes: 22020096}, block_gossip_params: {block_part_size_bytes: 512}}}' > "$TMHOME/new_genesis.json" +# mv "$TMHOME/new_genesis.json" "$TMHOME/genesis.json" +# bash scripts/txs/random.sh 1000 36657 &> /dev/null & +# PID=$! +# echo "==> Starting tendermint..." +# tendermint node --proxy_app=persistent_dummy &> /dev/null & +# sleep 5 +# echo "==> Killing tendermint..." +# kill -9 $PID +# killall tendermint - echo "==> Copying WAL log..." - $cutWALUntil "$TMHOME/data/cs.wal/wal" 1 consensus/test_data/new_small_block2.cswal - mv consensus/test_data/new_small_block2.cswal consensus/test_data/small_block2.cswal +# echo "==> Copying WAL log..." +# $cutWALUntil "$TMHOME/data/cs.wal/wal" 1 consensus/test_data/new_small_block2.cswal +# mv consensus/test_data/new_small_block2.cswal consensus/test_data/small_block2.cswal - reset -} +# reset +# } case "$1" in - "small_block1") - small_block1 - ;; - "small_block2") - small_block2 - ;; - "empty_block") - empty_block - ;; + # "small_block1") + # small_block1 + # ;; + # "small_block2") + # small_block2 + # ;; + # "empty_block") + # empty_block + # ;; "many_blocks") many_blocks ;; *) - small_block1 - small_block2 - empty_block + # small_block1 + # small_block2 + # empty_block many_blocks esac diff --git a/consensus/test_data/empty_block.cswal b/consensus/test_data/empty_block.cswal deleted file mode 100644 index 609f4ddf3592bbca3b7d6397422f139212041bd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 782 zcmeypSY3~SfkB8-@-mZ79bA{%RL)V`=aYMn(ok zkP4w~pP&)LUHa^1+XcK*fv~A3fZznw0My(4)Kd_d?NQX$MzUXUQ4{ z7pq>FoA{Z()^hprWuixlZ>&*2pmNo1X~4t7D*Vh5e3xba?XFgRznYx^Wb^U;fl@%j zLLoL^mSbQN2Dy@f(GlnX{*u(Zl+>c!%)FBLlGNf7pmRV$0rV_T3lK1h6irvt$+?+0 z;Yo(u$p!a>)SoAmp9krN$b&3MUlXVWQGx?TD5RFg|3icr2ROKREvM}RI#Chq#5e(Upeukb5kiX7)a3l!+{_Y? z*GryRxWWAsC!gtn*FQ`o`lnBI%KYBxK>V}x{eg8rC(1$mWBc|1*gyPm J|2V@v0|2ke84Caa diff --git a/consensus/test_data/small_block1.cswal b/consensus/test_data/small_block1.cswal deleted file mode 100644 index b7c7e777f92d51a05cd5beeab07ba7ceed69ba32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4041 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