Move test scripts to a new test directory

16 files changed, 11 insertions, 18 deletions

diff --git a/script/generate_in_tx.sh b/script/generate_in_tx.sh
deleted file mode 100644
index 904378d..0000000
--- a/script/generate_in_tx.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-for n in `shuf -i 000-999 -n $1`; do

-    btc-wire-cli transfer 0.0000$n

-    echo "BTC0.0000$n"

-done

-btc-wire-cli nblock

-echo "$1 incoming transaction generated"
\ No newline at end of file
diff --git a/script/reset_database.sh b/script/reset_database.sh
deleted file mode 100644
index 3dfb1c6..0000000
--- a/script/reset_database.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo -u postgres psql < wire-gateway/db/schema.sql > /dev/null
\ No newline at end of file
diff --git a/script/test_btc_conflict.sh b/test/btc/conflict.sh
index bb8b4dd..c7a915b 100644
--- a/script/test_btc_conflict.sh
+++ b/test/btc/conflict.sh
@@ -4,7 +4,7 @@
 
 set -eu
 
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 SCHEMA=btc.sql
 
 echo  "----- Setup -----"
@@ -66,7 +66,7 @@ echo " OK"
 echo  "----- Reset -----"
 echo "Cleanup"
 cleanup
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 echo "Load config file"
 load_config
 echo "Start database"
diff --git a/script/test_btc_fail.sh b/test/btc/fail.sh
index f39a0e9..c482200 100644
--- a/script/test_btc_fail.sh
+++ b/test/btc/fail.sh
@@ -4,7 +4,7 @@
 
 set -eu
 
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 SCHEMA=btc.sql
 
 echo  "----- Setup fail -----"
diff --git a/script/test_btc_hell.sh b/test/btc/hell.sh
index 0211295..7b83337 100644
--- a/script/test_btc_hell.sh
+++ b/test/btc/hell.sh
@@ -4,7 +4,7 @@
 
 set -eu
 
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 SCHEMA=btc.sql
 
 echo  "----- Setup -----"
@@ -79,7 +79,7 @@ echo " OK"
 echo  "----- Reset -----"
 echo "Cleanup"
 cleanup
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 echo "Load config file"
 load_config
 echo "Start database"
diff --git a/script/test_btc_lifetime.sh b/test/btc/lifetime.sh
index c59dfca..9b25d52 100644
--- a/script/test_btc_lifetime.sh
+++ b/test/btc/lifetime.sh
@@ -6,7 +6,7 @@ CONFIG=taler_lifetime.conf
 
 set -eu
 
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 SCHEMA=btc.sql
 
 echo  "----- Setup -----"
diff --git a/script/test_btc_reconnect.sh b/test/btc/reconnect.sh
index 09734b4..997b760 100644
--- a/script/test_btc_reconnect.sh
+++ b/test/btc/reconnect.sh
@@ -4,7 +4,7 @@
 
 set -eu
 
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 SCHEMA=btc.sql
 
 echo  "----- Setup -----"
diff --git a/script/test_btc_reorg.sh b/test/btc/reorg.sh
index d6f260e..7d13def 100644
--- a/script/test_btc_reorg.sh
+++ b/test/btc/reorg.sh
@@ -4,7 +4,7 @@
 
 set -eu
 
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 SCHEMA=btc.sql
 
 echo  "----- Setup -----"
diff --git a/script/test_btc_stress.sh b/test/btc/stress.sh
index c2eeff5..c1749a6 100644
--- a/script/test_btc_stress.sh
+++ b/test/btc/stress.sh
@@ -4,7 +4,7 @@
 
 set -eu
 
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 SCHEMA=btc.sql
 
 echo  "----- Setup stressed -----"
diff --git a/script/test_btc_wire.sh b/test/btc/wire.sh
index a3171d9..a11bd9a 100644
--- a/script/test_btc_wire.sh
+++ b/test/btc/wire.sh
@@ -4,7 +4,7 @@
 
 set -eu
 
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 SCHEMA=btc.sql
 
 echo  "----- Setup -----"
diff --git a/script/setup.sh b/test/common.sh
index 45aa42f..45aa42f 100644
--- a/script/setup.sh
+++ b/test/common.sh
diff --git a/script/conf/bitcoin.conf b/test/conf/bitcoin.conf
index a5fde61..a5fde61 100644
--- a/script/conf/bitcoin.conf
+++ b/test/conf/bitcoin.conf
diff --git a/script/conf/bitcoin2.conf b/test/conf/bitcoin2.conf
index 168b564..168b564 100644
--- a/script/conf/bitcoin2.conf
+++ b/test/conf/bitcoin2.conf
diff --git a/script/conf/taler_lifetime.conf b/test/conf/taler_lifetime.conf
index 4829d12..4829d12 100644
--- a/script/conf/taler_lifetime.conf
+++ b/test/conf/taler_lifetime.conf
diff --git a/script/conf/taler_test.conf b/test/conf/taler_test.conf
index a9fd6cd..a9fd6cd 100644
--- a/script/conf/taler_test.conf
+++ b/test/conf/taler_test.conf
diff --git a/script/test_gateway.sh b/test/gateway/api.sh
index 8bb292f..e3f60cd 100644
--- a/script/test_gateway.sh
+++ b/test/gateway/api.sh
@@ -16,7 +16,7 @@ function cleanup() {
 # Install cleanup handler (except for kill -9)
 trap cleanup EXIT
 
-source "${BASH_SOURCE%/*}/setup.sh"
+source "${BASH_SOURCE%/*}/../common.sh"
 ADDRESS=mpTJZxWPerz1Gife6mQSdHT8mMuJK6FP85
 SCHEMA=btc.sql