From cd9dfe29e85ee8352198044fc0fa7deba337f95f Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Sat, 3 Nov 2018 22:56:32 +0800 Subject: test: disable standalone RPC server as BroadcastBlock currently cause forking --- dex/handler.go | 4 +--- test/run_test.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dex/handler.go b/dex/handler.go index 00d2fb78c..68c682eda 100644 --- a/dex/handler.go +++ b/dex/handler.go @@ -1046,9 +1046,7 @@ func (pm *ProtocolManager) peerSetLoop() { for { select { - case event := <-pm.chainHeadCh: - pm.BroadcastBlock(event.Block, true) - + case <-pm.chainHeadCh: newRound := pm.gov.LenCRS() - 1 log.Trace("new round", "round", newRound) if newRound == round { diff --git a/test/run_test.sh b/test/run_test.sh index c07da0f8e..66387e703 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -15,14 +15,14 @@ rm -f log-latest ln -s $logsdir log-latest # A standalone RPC server for accepting RPC requests. -datadir=$PWD/Dexon.rpc -rm -rf $datadir -$GDEX --datadir=$datadir init genesis.json -$GDEX --verbosity=4 --gcmode=archive --datadir=$datadir \ - --rpc --rpcapi=eth,net,web3,debug --rpcaddr=0.0.0.0 --rpcport=8543 \ - --ws --wsapi=eth,net,web3,debug --wsaddr=0.0.0.0 --wsport=8544 \ - --wsorigins='*' --rpcvhosts='*' --rpccorsdomain="*" \ - > $logsdir/gdex.rpc.log 2>&1 & +# datadir=$PWD/Dexon.rpc +# rm -rf $datadir +# $GDEX --datadir=$datadir init genesis.json +# $GDEX --verbosity=4 --gcmode=archive --datadir=$datadir \ +# --rpc --rpcapi=eth,net,web3,debug --rpcaddr=0.0.0.0 --rpcport=8543 \ +# --ws --wsapi=eth,net,web3,debug --wsaddr=0.0.0.0 --wsport=8544 \ +# --wsorigins='*' --rpcvhosts='*' --rpccorsdomain="*" \ +# > $logsdir/gdex.rpc.log 2>&1 & # Nodes for i in $(seq 0 3); do -- cgit