From c82e421abb57e05f5d8e53b0ecd72f30d0bf28b6 Mon Sep 17 00:00:00 2001
From: WYANG008 <weitao.yang@finbook.co>
Date: Tue, 26 Feb 2019 14:52:42 +0800
Subject: [PATCH] update

---
 bash/{aws1.sh => aws.sh}     | 3 ++-
 bash/aws2.sh                 | 1 -
 bash/{azure1.sh => azure.sh} | 3 ++-
 bash/azure2.sh               | 1 -
 bash/{gcp1.sh => gcp.sh}     | 3 ++-
 bash/gcp2.sh                 | 1 -
 package.json                 | 2 --
 7 files changed, 6 insertions(+), 8 deletions(-)
 rename bash/{aws1.sh => aws.sh} (70%)
 delete mode 100644 bash/aws2.sh
 rename bash/{azure1.sh => azure.sh} (70%)
 delete mode 100644 bash/azure2.sh
 rename bash/{gcp1.sh => gcp.sh} (70%)
 delete mode 100644 bash/gcp2.sh

diff --git a/bash/aws1.sh b/bash/aws.sh
similarity index 70%
rename from bash/aws1.sh
rename to bash/aws.sh
index 588c55f..15328b9 100644
--- a/bash/aws1.sh
+++ b/bash/aws.sh
@@ -3,4 +3,5 @@ rm *.log
 npm run trades assets=ETH,USD server aws &> trades.ALL.log &
 npm run commit server aws pair=ETH_USD &>> commit.log &
 npm run cleanDB server aws &>> cleanDB.log &
-npm run round contractType=Vivaldi tenor=100C-3H debug server aws &>> vivaldi-100C-3H.log &
\ No newline at end of file
+npm run round contractType=Vivaldi tenor=100C-3H debug server aws &>> vivaldi-100C-3H.log &
+npm run events server events=StartReset,StartPreReset,Others $1 &>> events.log &
\ No newline at end of file
diff --git a/bash/aws2.sh b/bash/aws2.sh
deleted file mode 100644
index 8c84d78..0000000
--- a/bash/aws2.sh
+++ /dev/null
@@ -1 +0,0 @@
-npm run events server events=StartReset,StartPreReset,Others $1 &>> events.log &
\ No newline at end of file
diff --git a/bash/azure1.sh b/bash/azure.sh
similarity index 70%
rename from bash/azure1.sh
rename to bash/azure.sh
index de2e6c6..ffde7cd 100644
--- a/bash/azure1.sh
+++ b/bash/azure.sh
@@ -3,4 +3,5 @@ rm *.log
 npm run trades assets=ETH,USD server azure &> trades.ALL.log &
 npm run commit server azure pair=ETH_USD &>> commit.log &
 npm run cleanDB server azure &>> cleanDB.log &
-npm run round contractType=Vivaldi tenor=100C-3H debug server azure &>> vivaldi-100C-3H.log &
\ No newline at end of file
+npm run round contractType=Vivaldi tenor=100C-3H debug server azure &>> vivaldi-100C-3H.log &
+npm run events server events=StartReset,StartPreReset,Others $1 &>> events.log &
\ No newline at end of file
diff --git a/bash/azure2.sh b/bash/azure2.sh
deleted file mode 100644
index 8c84d78..0000000
--- a/bash/azure2.sh
+++ /dev/null
@@ -1 +0,0 @@
-npm run events server events=StartReset,StartPreReset,Others $1 &>> events.log &
\ No newline at end of file
diff --git a/bash/gcp1.sh b/bash/gcp.sh
similarity index 70%
rename from bash/gcp1.sh
rename to bash/gcp.sh
index e24828f..8b47267 100644
--- a/bash/gcp1.sh
+++ b/bash/gcp.sh
@@ -3,4 +3,5 @@ rm *.log
 npm run trades assets=ETH,USD server gcp &> trades.ALL.log &
 npm run commit server gcp pair=ETH_USD &>> commit.log &
 npm run cleanDB server gcp &>> cleanDB.log &
-npm run round contractType=Vivaldi tenor=100C-3H debug server gcp &>> vivaldi-100C-3H.log &
\ No newline at end of file
+npm run round contractType=Vivaldi tenor=100C-3H debug server gcp &>> vivaldi-100C-3H.log &
+npm run events server events=StartReset,StartPreReset,Others $1 &>> events.log &
\ No newline at end of file
diff --git a/bash/gcp2.sh b/bash/gcp2.sh
deleted file mode 100644
index 8c84d78..0000000
--- a/bash/gcp2.sh
+++ /dev/null
@@ -1 +0,0 @@
-npm run events server events=StartReset,StartPreReset,Others $1 &>> events.log &
\ No newline at end of file
diff --git a/package.json b/package.json
index ddd7fac..1fbee35 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,10 @@
 		"tslint": "tslint -c tslint.json -p tsconfig.json src/**/*.ts{,x} --fix",
 		"commit": "ts-node ./src/index commit",
 		"trades": "ts-node src/index trades",
-		"trigger": "ts-node ./src/index trigger",
 		"prices": "ts-node src/index prices",
 		"node": "ts-node ./src/index node",
 		"cleanDB": "ts-node ./src/index cleanDB",
 		"fetchPrice": "ts-node ./src/index fetchPrice",
-		"fetchEvents": "ts-node ./src/index fetchEvents",
 		"startCustodian": "ts-node ./src/index startCustodian",
 		"round": "ts-node ./src/index round",
 		"events": "ts-node ./src/index events"