From 16ecda951b767800b4e09ad8e86e0866b05136be Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Wed, 25 Feb 2015 20:06:59 +0700
Subject: integrate blockpool into eth - remove blockpool code - remove
 blockpool integration test (kinda embarrassing) - remove errors.go

---
 eth/test/README.md       |  27 ------------------------
 eth/test/bootstrap.sh    |   9 --------
 eth/test/chains/00.chain | Bin 9726 -> 0 bytes
 eth/test/chains/01.chain | Bin 13881 -> 0 bytes
 eth/test/chains/02.chain | Bin 14989 -> 0 bytes
 eth/test/chains/03.chain | Bin 18590 -> 0 bytes
 eth/test/chains/04.chain | Bin 20529 -> 0 bytes
 eth/test/mine.sh         |  20 ------------------
 eth/test/run.sh          |  53 -----------------------------------------------
 eth/test/tests/00.chain  |   1 -
 eth/test/tests/00.sh     |  13 ------------
 eth/test/tests/01.chain  |   1 -
 eth/test/tests/01.sh     |  18 ----------------
 eth/test/tests/02.chain  |   1 -
 eth/test/tests/02.sh     |  19 -----------------
 eth/test/tests/03.chain  |   1 -
 eth/test/tests/03.sh     |  14 -------------
 eth/test/tests/04.sh     |  17 ---------------
 eth/test/tests/05.sh     |  20 ------------------
 eth/test/tests/common.js |   9 --------
 eth/test/tests/common.sh |  20 ------------------
 21 files changed, 243 deletions(-)
 delete mode 100644 eth/test/README.md
 delete mode 100644 eth/test/bootstrap.sh
 delete mode 100755 eth/test/chains/00.chain
 delete mode 100755 eth/test/chains/01.chain
 delete mode 100755 eth/test/chains/02.chain
 delete mode 100755 eth/test/chains/03.chain
 delete mode 100755 eth/test/chains/04.chain
 delete mode 100644 eth/test/mine.sh
 delete mode 100644 eth/test/run.sh
 delete mode 120000 eth/test/tests/00.chain
 delete mode 100644 eth/test/tests/00.sh
 delete mode 120000 eth/test/tests/01.chain
 delete mode 100644 eth/test/tests/01.sh
 delete mode 120000 eth/test/tests/02.chain
 delete mode 100644 eth/test/tests/02.sh
 delete mode 120000 eth/test/tests/03.chain
 delete mode 100644 eth/test/tests/03.sh
 delete mode 100644 eth/test/tests/04.sh
 delete mode 100644 eth/test/tests/05.sh
 delete mode 100644 eth/test/tests/common.js
 delete mode 100644 eth/test/tests/common.sh

(limited to 'eth/test')

diff --git a/eth/test/README.md b/eth/test/README.md
deleted file mode 100644
index 65728efa5..000000000
--- a/eth/test/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-= Integration tests for eth protocol and blockpool 
-
-This is a simple suite of tests to fire up a local test node with peers to test blockchain synchronisation and download. 
-The scripts call ethereum (assumed to be compiled in go-ethereum root). 
-
-To run a test:
-
-    . run.sh 00 02
-
-Without arguments, all tests are run. 
-
-Peers are launched with preloaded imported chains. In order to prevent them from synchronizing with each other they are set with `-dial=false` and `-maxpeer 1` options. They log into `/tmp/eth.test/nodes/XX` where XX is the last two digits of their port. 
-
-Chains to import can be bootstrapped by letting nodes mine for some time. This is done with 
-
-    . bootstrap.sh 
-
-Only the relative timing and forks matter so they should work if the bootstrap script is rerun. 
-The reference blockchain of tests are soft links to these import chains and check at the end of a test run. 
-
-Connecting to peers and exporting blockchain is scripted with JS files executed by the JSRE, see `tests/XX.sh`. 
-
-Each test is set with a timeout. This may vary on different computers so adjust sensibly. 
-If you kill a test before it completes, do not forget to kill all the background processes, since they will impact the result. Use:
-
-    killall ethereum
-
diff --git a/eth/test/bootstrap.sh b/eth/test/bootstrap.sh
deleted file mode 100644
index 3da038be8..000000000
--- a/eth/test/bootstrap.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# bootstrap chains - used to regenerate tests/chains/*.chain
-
-mkdir -p chains
-bash ./mine.sh 00 10
-bash ./mine.sh 01 5 00
-bash ./mine.sh 02 10 00
-bash ./mine.sh 03 5 02
-bash ./mine.sh 04 10 02
\ No newline at end of file
diff --git a/eth/test/chains/00.chain b/eth/test/chains/00.chain
deleted file mode 100755
index ad3c05b24..000000000
Binary files a/eth/test/chains/00.chain and /dev/null differ
diff --git a/eth/test/chains/01.chain b/eth/test/chains/01.chain
deleted file mode 100755
index 56c9aef65..000000000
Binary files a/eth/test/chains/01.chain and /dev/null differ
diff --git a/eth/test/chains/02.chain b/eth/test/chains/02.chain
deleted file mode 100755
index 440c92d65..000000000
Binary files a/eth/test/chains/02.chain and /dev/null differ
diff --git a/eth/test/chains/03.chain b/eth/test/chains/03.chain
deleted file mode 100755
index 1cc7570ab..000000000
Binary files a/eth/test/chains/03.chain and /dev/null differ
diff --git a/eth/test/chains/04.chain b/eth/test/chains/04.chain
deleted file mode 100755
index d4e5b1aa8..000000000
Binary files a/eth/test/chains/04.chain and /dev/null differ
diff --git a/eth/test/mine.sh b/eth/test/mine.sh
deleted file mode 100644
index 0d95db1e4..000000000
--- a/eth/test/mine.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# bash ./mine.sh node_id timeout(sec) [basechain]
-ETH=../../ethereum
-MINE="$ETH -datadir tmp/nodes/$1 -seed=false -port '' -shh=false -id test$1"
-rm -rf tmp/nodes/$1
-echo "Creating chain $1..."
-if [[ "" !=  "$3" ]]; then
-  CHAIN="chains/$3.chain"
-  CHAINARG="-chain $CHAIN"
-  $MINE -mine $CHAINARG -loglevel 3 | grep 'importing'
-fi
-$MINE -mine -loglevel 0 &
-PID=$!
-sleep $2
-kill $PID
-$MINE -loglevel 3 <(echo "eth.export(\"chains/$1.chain\")") > /tmp/eth.test/mine.tmp &
-PID=$!
-sleep 1
-kill $PID
-cat /tmp/eth.test/mine.tmp | grep 'exporting'
diff --git a/eth/test/run.sh b/eth/test/run.sh
deleted file mode 100644
index 5229af035..000000000
--- a/eth/test/run.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-# bash run.sh (testid0 testid1 ...)
-# runs tests tests/testid0.sh tests/testid1.sh ...
-# without arguments, it runs all tests
-
-. tests/common.sh
-
-TESTS=
-
-if [ "$#" -eq 0 ]; then
-  for NAME in tests/??.sh; do
-    i=`basename $NAME .sh`
-    TESTS="$TESTS $i"
-  done
-else
-  TESTS=$@
-fi
-
-ETH=../../ethereum
-DIR="/tmp/eth.test/nodes"
-TIMEOUT=10
-
-mkdir -p $DIR/js
-
-echo "running tests $TESTS"
-for NAME in $TESTS; do
-  PIDS=
-  CHAIN="tests/$NAME.chain"
-  JSFILE="$DIR/js/$NAME.js"
-  CHAIN_TEST="$DIR/$NAME/chain"
-
-  echo "RUN: test $NAME"
-  cat tests/common.js > $JSFILE
-  . tests/$NAME.sh
-  sleep $TIMEOUT
-  echo "timeout after $TIMEOUT seconds: killing $PIDS"
-  kill $PIDS
-  if [ -r "$CHAIN" ]; then
-    if diff $CHAIN $CHAIN_TEST >/dev/null ; then
-      echo "chain ok: $CHAIN=$CHAIN_TEST"
-    else
-      echo "FAIL: chains differ: expected $CHAIN ; got $CHAIN_TEST"
-      continue
-    fi
-  fi
-  ERRORS=$DIR/errors
-  if [ -r "$ERRORS" ]; then
-    echo "FAIL: "
-    cat $ERRORS
-  else
-    echo PASS
-  fi
-done
\ No newline at end of file
diff --git a/eth/test/tests/00.chain b/eth/test/tests/00.chain
deleted file mode 120000
index 9655cb3df..000000000
--- a/eth/test/tests/00.chain
+++ /dev/null
@@ -1 +0,0 @@
-../chains/01.chain
\ No newline at end of file
diff --git a/eth/test/tests/00.sh b/eth/test/tests/00.sh
deleted file mode 100644
index 9c5077164..000000000
--- a/eth/test/tests/00.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-TIMEOUT=4
-
-cat >> $JSFILE <<EOF
-eth.addPeer("localhost:30311");
-sleep(1000)
-eth.export("$CHAIN_TEST");
-EOF
-
-peer 11 01
-test_node $NAME "" -loglevel 5 $JSFILE
-
diff --git a/eth/test/tests/01.chain b/eth/test/tests/01.chain
deleted file mode 120000
index ae65ccb37..000000000
--- a/eth/test/tests/01.chain
+++ /dev/null
@@ -1 +0,0 @@
-../chains/02.chain
\ No newline at end of file
diff --git a/eth/test/tests/01.sh b/eth/test/tests/01.sh
deleted file mode 100644
index 1601e0dfb..000000000
--- a/eth/test/tests/01.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-TIMEOUT=5
-
-cat >> $JSFILE <<EOF
-eth.addPeer("localhost:30311");
-log("added peer localhost:30311");
-sleep(1000);
-log("added peer localhost:30312");
-eth.addPeer("localhost:30312");
-sleep(3000);
-eth.export("$CHAIN_TEST");
-EOF
-
-peer 11 01
-peer 12 02
-test_node $NAME "" -loglevel 5 $JSFILE
-
diff --git a/eth/test/tests/02.chain b/eth/test/tests/02.chain
deleted file mode 120000
index 9655cb3df..000000000
--- a/eth/test/tests/02.chain
+++ /dev/null
@@ -1 +0,0 @@
-../chains/01.chain
\ No newline at end of file
diff --git a/eth/test/tests/02.sh b/eth/test/tests/02.sh
deleted file mode 100644
index 619217ed8..000000000
--- a/eth/test/tests/02.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-TIMEOUT=6
-
-cat >> $JSFILE <<EOF
-eth.addPeer("localhost:30311");
-sleep(200);
-eth.addPeer("localhost:30312");
-sleep(3000);
-eth.export("$CHAIN_TEST");
-EOF
-
-peer 11 01
-peer 12 02
-P12ID=$PID
-test_node $NAME "" -loglevel 5 $JSFILE
-sleep 0.3
-kill $P12ID
-
diff --git a/eth/test/tests/03.chain b/eth/test/tests/03.chain
deleted file mode 120000
index b07c49a30..000000000
--- a/eth/test/tests/03.chain
+++ /dev/null
@@ -1 +0,0 @@
-../chains/12k.chain
\ No newline at end of file
diff --git a/eth/test/tests/03.sh b/eth/test/tests/03.sh
deleted file mode 100644
index d7dba737f..000000000
--- a/eth/test/tests/03.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-TIMEOUT=12
-
-cat >> $JSFILE <<EOF
-eth.addPeer("localhost:30311");
-sleep(10000);
-eth.export("$CHAIN_TEST");
-EOF
-
-peer 11 12k
-sleep 2
-test_node $NAME "" -loglevel 5 $JSFILE
-
diff --git a/eth/test/tests/04.sh b/eth/test/tests/04.sh
deleted file mode 100644
index d77c360ba..000000000
--- a/eth/test/tests/04.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-TIMEOUT=15
-
-cat >> $JSFILE <<EOF
-eth.addPeer("localhost:30311");
-sleep(200);
-eth.addPeer("localhost:30312");
-sleep(13000);
-eth.export("$CHAIN_TEST");
-EOF
-
-peer 11 01 -mine
-peer 12 02
-test_node $NAME "" -loglevel 5 $JSFILE
-sleep 6
-cat $DIR/$NAME/debug.log | grep 'best peer'
diff --git a/eth/test/tests/05.sh b/eth/test/tests/05.sh
deleted file mode 100644
index 0a0f94df5..000000000
--- a/eth/test/tests/05.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-TIMEOUT=60
-
-cat >> $JSFILE <<EOF
-eth.addPeer("localhost:30311");
-sleep(200);
-eth.addPeer("localhost:30312");
-eth.addPeer("localhost:30313");
-eth.addPeer("localhost:30314");
-sleep(3000);
-eth.export("$CHAIN_TEST");
-EOF
-
-peer 11 01 -mine
-peer 12 02 -mine
-peer 13 03
-peer 14 04
-test_node $NAME "" -loglevel 5 $JSFILE
-
diff --git a/eth/test/tests/common.js b/eth/test/tests/common.js
deleted file mode 100644
index 206ebf145..000000000
--- a/eth/test/tests/common.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function log(text) {
-  console.log("[JS TEST SCRIPT] " + text);
-}
-
-function sleep(seconds) {
-    var now = new Date().getTime();
-    while(new Date().getTime() < now + seconds){}
-}
-
diff --git a/eth/test/tests/common.sh b/eth/test/tests/common.sh
deleted file mode 100644
index f66cfb43e..000000000
--- a/eth/test/tests/common.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# launched by run.sh
-function test_node {
-  rm -rf $DIR/$1
-  ARGS="-datadir $DIR/$1 -debug debug -seed=false -shh=false -id test$1 -port 303$1"
-  if [ "" != "$2" ]; then
-    chain="chains/$2.chain"
-    echo "import chain $chain"
-    $ETH $ARGS -loglevel 3 -chain $chain | grep CLI |grep import
-  fi
-  echo "starting test node $1 with args $ARGS ${@:3}"
-  $ETH $ARGS  ${@:3} &
-  PID=$!
-  PIDS="$PIDS $PID"
-}
-
-function peer {
-  test_node $@ -loglevel 5 -logfile debug.log -maxpeer 1 -dial=false
-}
\ No newline at end of file
-- 
cgit v1.2.3