You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@milagro.apache.org by cm...@apache.org on 2019/10/11 09:56:14 UTC
[incubator-milagro-dta] 01/03: Fix e2e tests
This is an automated email from the ASF dual-hosted git repository.
cmorris pushed a commit to branch tendermint
in repository https://gitbox.apache.org/repos/asf/incubator-milagro-dta.git
commit 5a806f0cd29a0755b92e338dfb5bee776fb1f1d9
Author: Christopher Morris <ch...@morris.net>
AuthorDate: Fri Oct 11 10:39:57 2019 +0100
Fix e2e tests
---
cmd/service/main.go | 4 +--
cmd/servicetester/e2e_test.sh | 68 ++++++++++++++++++++++++-------------------
cmd/servicetester/fulltest.sh | 10 +++++--
go.mod | 1 +
4 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/cmd/service/main.go b/cmd/service/main.go
index 88a101d..d34580f 100644
--- a/cmd/service/main.go
+++ b/cmd/service/main.go
@@ -219,8 +219,8 @@ func startDaemon(args []string) error {
case "none":
return nil
case "dump":
- return nil
- // return svcPlugin.Dump(tx)
+ //return nil
+ return svcPlugin.Dump(tx)
case "v1/fulfill/order":
_, err := svcPlugin.FulfillOrder(tx)
return err
diff --git a/cmd/servicetester/e2e_test.sh b/cmd/servicetester/e2e_test.sh
index 236ee29..7d1b0f4 100755
--- a/cmd/servicetester/e2e_test.sh
+++ b/cmd/servicetester/e2e_test.sh
@@ -24,20 +24,27 @@ defaultURL="http://localhost:5556"
apiURL="${1:-$defaultURL}"
configdir=~/.milagro
host="34.246.173.153:26657"
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+ORANGE='\033[0;33m'
+BLUE='\033[1;34m'
+NC='\033[0m' # No Color
+
+
status () {
#Determine if an extension is running
statusOutput=$(curl -s -X GET "$apiURL/$apiVersion/status" -H "accept: */*" -H "Content-Type: application/json")
- echo "$apiURL/$apiVersion/status"
+ #printf "$apiURL/$apiVersion/status\n"
identity=$(echo $statusOutput | jq .nodeCID)
extensionVendor=$(echo $statusOutput | jq -r .extensionVendor)
plugin=$(echo $statusOutput | jq -r .plugin)
- echo "Plugin $plugin"
+ printf "Plugin ${BLUE}$plugin ${NC}\n"
if [ -z "${extensionVendor}" ]; then
- echo "Server Not Running"
+ printf "${RED} Server Not Running{NC}\n"
exit 1
fi
}
@@ -46,38 +53,39 @@ status () {
execute_bitcoin () {
# #Run 4 Tests against the Bitcoin Extension
- echo "Bitcoin Plugin Tests [2 Tests]"
+ echo " Bitcoin Plugin Tests [2 Tests]"
( sleep 1; curl -s -X POST "$apiURL/$apiVersion/order" -H "accept: */*" -H "Content-Type: application/json" -d "{\"beneficiaryIDDocumentCID\":\"\",\"extension\":{\"coin\":\"0\"}}" > ref ) &
output1=$(fishhook $configdir $host "self" 2)
- ref=$(cat ref)
+ ref=$(cat ref | jq .orderReference)
commitment1=$(echo $output1 | jq .OrderPart2.CommitmentPublicKey)
address1=$(echo $output1 | jq .OrderPart2.Extension.address)
(sleep 1; curl -s -X POST "$apiURL/$apiVersion/order/secret" -H "accept: */*" -H "Content-Type: application/json" -d "{\"orderReference\":$ref,\"beneficiaryIDDocumentCID\":$identity}" > /dev/null ) &
+
output2=$(fishhook $configdir $host "self" 2)
address2=$(echo $output2 | jq .OrderPart4.Extension.address)
commitment2=$(echo $output2 | jq .OrderPart4.Extension.FinalPublicKey)
#echo "Committment1 $commitment1 $address1"
#echo "Committment2 $commitment2 $address2"
if [ -z $commitment2 ]; then
- echo "Failed Commitment is empty"
+ printf " ${RED}FAIL${NC} Commitment is empty\n"
exit 1
fi
if [ $commitment1 != $commitment2 ]; then
- echo "Fail"
+ printf " ${RED}FAIL${NC}\n "
exit 1
fi
if [ $address2 != $address2 ]; then
- echo "Fail"
+ printf " ${RED}FAIL${NC}\n "
exit 1
fi
- echo "Pass - Id, Order & OrderSecret(Beneficiary)"
+ printf " ${GREEN}Pass${NC} - Id, Order & OrderSecret(Beneficiary)\n"
( sleep 1; curl -s -X POST "$apiURL/$apiVersion/order" -H "accept: */*" -H "Content-Type: application/json" -d "{\"beneficiaryIDDocumentCID\":$identity,\"extension\":{\"coin\":\"0\"}}" > ref ) &
output1=$(fishhook $configdir $host "self" 2)
- ref=$(cat ref)
+ ref=$(cat ref | jq .orderReference)
commitment1=$(echo $output1 | jq .OrderPart2.CommitmentPublicKey)
address1=$(echo $output1 | jq .OrderPart2.Extension.address)
(sleep 1; curl -s -X POST "$apiURL/$apiVersion/order/secret" -H "accept: */*" -H "Content-Type: application/json" -d "{\"orderReference\":$ref}" > /dev/null ) &
@@ -87,18 +95,18 @@ execute_bitcoin () {
#echo "Committment1 $commitment1 $address1"
#echo "Committment2 $commitment2 $address2"
if [ -z $commitment2 ]; then
- echo "Failed Commitment is empty"
+ printf " ${RED}FAIL${NC} Commitment is empty\n"
exit 1
fi
if [ $commitment1 != $commitment2 ]; then
- echo "Fail"
+ printf " ${RED}FAIL${NC}\n "
exit 1
fi
if [ $address2 != $address2 ]; then
- echo "Fail"
+ printf " ${RED}FAIL${NC}\n"
exit 1
fi
- echo "Pass - Id, Order(Beneficiary) & OrderSecret"
+ printf " ${GREEN}Pass${NC} - Id, Order(Beneficiary) & OrderSecret\n"
}
@@ -107,12 +115,12 @@ execute_bitcoin () {
execute_safeguardsecret () {
inputString="This is some random test text 1234567890!"
- echo "Encrypt a String [1 Test]"
+ printf " Encrypt a String [1 Test]\n"
( sleep 1; curl -s -X POST "$apiURL/$apiVersion/order" -H "accept: */*" -H "Content-Type: application/json" -d "{\"beneficiaryIDDocumentCID\":$identity,\"extension\":{\"plainText\":\"$inputString\"}}" > ref ) &
output1=$(fishhook $configdir $host "self" 2)
- ref=$(cat ref)
+ ref=$(cat ref | jq .orderReference)
cipherText=$(echo $output1 | jq .OrderPart2.Extension.cypherText)
#echo $cipherText
@@ -122,14 +130,14 @@ execute_safeguardsecret () {
if [ -z "$plaintext" ]; then
- echo "Failed Commitment is empty"
+ printf " ${RED}FAIL${NC} Commitment is empty\n"
exit 1
fi
if [ "$inputString" == "$plaintext" ]; then
- echo "Order Create/Retrieve Pass"
+ printf " ${GREEN}Pass ${NC}Order Create/Retrieve\n"
else
- echo "Order Create/Retrieve Fail"
+ printf " ${RED}FAIL ${NC}Order Create/Retrieve\n"
exit 1
fi
@@ -139,10 +147,10 @@ execute_safeguardsecret () {
execute_milagro () {
- echo "Milagro Tests [1 Test]"
+ echo " Milagro Tests [1 Test]"
( sleep 1; curl -s -X POST "$apiURL/$apiVersion/order" -H "accept: */*" -H "Content-Type: application/json" -d "{\"beneficiaryIDDocumentCID\":$identity}" > ref ) &
output1=$(fishhook $configdir $host "self" 1)
- ref=$(cat ref)
+ ref=$(cat ref | jq .orderReference)
commitment1=$(echo $output1 | jq .OrderPart2.CommitmentPublicKey)
#echo "Committment1 $commitment1"
@@ -154,14 +162,14 @@ execute_milagro () {
#echo "Committment2 $commitment2"
if [ -z $commitment2 ]; then
- echo "Failed Commitment is empty"
+ eprintfcho " ${RED}FAIL${NC} Commitment is empty\n"
exit 1
fi
if [ $commitment1 == $commitment2 ]; then
- echo "Order Create/Retrieve Pass"
+ printf " ${GREEN}Pass${NC} Order Create/Retrieve\n"
else
- echo "Order Create/Retrieve Fail"
+ printf " ${RED}FAIL${NC} Order Create/Retrieve\n"
exit 1
fi
}
@@ -174,7 +182,7 @@ execute_milagro () {
# #############################################################################
execute_orderlist () {
- echo "Milagro Tests [1 Test]"
+ printf "Milagro Tests [1 Test]\n"
commitment2=$(echo $output2 | jq .commitment)
outputList=$(curl -s -X GET "$apiURL/$apiVersion/order?page=0&perPage=2&sortBy=dateCreatedDsc" -H "accept: */*")
orderReference=$(echo $outputList | jq -r ".orderReference | .[$orderIndex]")
@@ -184,10 +192,10 @@ execute_orderlist () {
hasSecret=`echo $outputOrder | grep "Secret"`
if [ -z $hasSecret ]; then
- echo "Failed Order has error"
+ printf " ${RED}FAIL${NC} Order has erro\n"
exit 1
else
- echo "Passed orderList & get"
+ printf " ${GREEN}Pass${NC} orderList & get\n"
fi
}
@@ -195,20 +203,20 @@ execute_orderlist () {
status
+
if [ $plugin == "bitcoinwallet" ]; then
execute_bitcoin
fi
-if [ $plugin == "qredoplugin" ]; then
- execute_bitcoin
-fi
if [ $plugin == "milagro" ]; then
execute_milagro
fi
+
if [ $plugin == "safeguardsecret" ]; then
execute_safeguardsecret
fi
+
#execute_orderlist
diff --git a/cmd/servicetester/fulltest.sh b/cmd/servicetester/fulltest.sh
index 3c1f991..7586079 100755
--- a/cmd/servicetester/fulltest.sh
+++ b/cmd/servicetester/fulltest.sh
@@ -17,6 +17,12 @@
# specific language governing permissions and limitations
# under the License.
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+ORANGE='\033[0;33m'
+NC='\033[0m' # No Color
+
+
pushd () {
command pushd "$@" > /dev/null
@@ -35,9 +41,9 @@ start_server () {
report () {
if [ $2 -eq 0 ]; then
- echo "PASSED $1"
+ printf " ${GREEN}PASSED $1 ${NC}\n"
else
- echo "FAILED $1"
+ printf " ${RED}FAILED $1 ${NC}\n"
fi
}
diff --git a/go.mod b/go.mod
index 7e241de..b7aa963 100644
--- a/go.mod
+++ b/go.mod
@@ -20,6 +20,7 @@ require (
github.com/leodido/go-urn v1.1.0 // indirect
github.com/mattn/go-colorable v0.1.4 // indirect
github.com/mattn/go-isatty v0.0.9 // indirect
+ github.com/mr-tron/base58 v1.1.2
github.com/multiformats/go-multihash v0.0.5
github.com/mwitkow/go-proto-validators v0.1.0
github.com/pkg/errors v0.8.1