Merge eosd_run_mongodb_test.sh into eosd_run_test.py.

.travis.yml

@@ -77,10 +77,10 @@ script:
   - mkdir build && cd build
   - ${CMAKE_DIR}cmake -G Ninja -DWASM_LLVM_CONFIG=$TRAVIS_BUILD_DIR/ext/wasm-compiler/bin/llvm-config -DSecp256k1_ROOT_DIR=$TRAVIS_BUILD_DIR/ext -DBINARYEN_ROOT=$TRAVIS_BUILD_DIR/ext/wasm-compiler -DCMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/ext -DCMAKE_BUILD_TYPE=Release $EOS_CMAKE_OPTIONS ..
   - ninja -j4
-  - '[ "$TRAVIS_OS_NAME" == "osx" ] || tests/eosd_run_test.py --host=localhost --port=8888'
+  - tests/eosd_run_test.py --host=localhost --port=8888 --dumpErrorDetails'
   - '[ "$TRAVIS_OS_NAME" == "osx" ] || tests/p2p_tests/sync/test.sh'
   - '[ "$TRAVIS_OS_NAME" == "osx" ] || tests/p2p_tests/sync/test.sh -p 2 -d 10'
   - '[ "$TRAVIS_OS_NAME" == "osx" ] || tests/run_tests.sh'
-  - '[ "$TRAVIS_OS_NAME" == "osx" ] || tests/eosd_run_mongodb_test.sh'
+  - '[ "$TRAVIS_OS_NAME" == "osx" ] || tests/eosd_run_test.py --mongoDb --dumpErrorDetails'
   - ctest --output-on-failure
   - cpack

tests/CMakeLists.txt

@@ -44,7 +44,6 @@ if(WASM_TOOLCHAIN)
   add_dependencies(api_test test_api memory_test extended_memory_test table_abi_test)
 endif()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/eosd_run_test.sh ${CMAKE_CURRENT_BINARY_DIR}/eosd_run_test.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/eosd_run_mongodb_test.sh ${CMAKE_CURRENT_BINARY_DIR}/eosd_run_mongodb_test.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/p2p_tests/sync/test.sh ${CMAKE_CURRENT_BINARY_DIR}/p2p_tests/sync/test.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run_tests.sh ${CMAKE_CURRENT_BINARY_DIR}/run_tests.sh COPYONLY)

tests/eosd_run_mongodb_test.sh

-#!/bin/bash
-
-# prevent bc from adding \ at end of large hex values
-export BC_LINE_LENGTH=9999
-# test database, it is dropped before test run
-export DB=mongodb://localhost:27017/EOStest
-
-# $1 - error message
-error()
-{
-  (>&2 echo $1)
-  killAll
-  exit 1
-}
-
-verifyErrorCode()
-{
-  rc=$?
-  if [[ $rc != 0 ]]; then
-    error "FAILURE - $1 returned error code $rc"
-  fi
-}
-
-killAll()
-{
-  programs/launcher/launcher -k 9
-  kill -9 $WALLETD_PROC_ID
-}
-
-cleanup()
-{
- rm -rf tn_data_00
- rm -rf test_wallet_0
- INFO="$(echo 'db.dropDatabase()' | mongo $DB)"
-}
-
-# $1 - string that contains "transaction_id": "<trans id>", in it
-# result <trans id> stored in TRANS_ID
-getTransactionId()
-{
-  TRANS_ID="$(echo "$1" | awk '/transaction_id/ {print $2}')"
-  # remove leading/trailing quotes
-  TRANS_ID=${TRANS_ID#\"}
-  TRANS_ID=${TRANS_ID%\",}
-}
-
-# result stored in HEAD_BLOCK_NUM
-getHeadBlockNum()
-{
-  INFO="$(echo 'db.Blocks.find().sort({"_id":-1}).limit(1).pretty()' | mongo $DB)"
-  verifyErrorCode "mongo last block"
-  HEAD_BLOCK_NUM="$(echo "$INFO" | awk '/block_num/ {print $3}')"
-  # remove trailing coma
-  HEAD_BLOCK_NUM=${HEAD_BLOCK_NUM%,}
-}
-
-waitForNextBlock()
-{
-  getHeadBlockNum
-  NEXT_BLOCK_NUM=$((HEAD_BLOCK_NUM+2))
-  while [ "$HEAD_BLOCK_NUM" -lt "$NEXT_BLOCK_NUM" ]; do
-    sleep 0.25
-    getHeadBlockNum
-  done
-}
-
-getTransactionCount()
-{
-  INFO="$(echo 'print("count " + db.Transactions.count())' | mongo $DB)"
-  TRANS_COUNT="$(echo "$INFO" | awk '/count/ {print $2}')"
-}
-
-waitForNextTransaction()
-{
-  getTransactionCount
-  NEXT_TRANS_COUNT=$((TRANS_COUNT+1))
-  echo "Waiting for next transaction $NEXT_TRANS_COUNT"
-  while [ "$TRANS_COUNT" -lt "$NEXT_TRANS_COUNT" ]; do
-    sleep 0.50
-    getTransactionCount
-  done
-  echo "Done waiting for transaction $NEXT_TRANS_COUNT"
-}
-
-# cleanup from last run
-cleanup
-
-INITA_PRV_KEY="5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
-INITB_PRV_KEY="5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
-LOG_FILE=eosd_run_test.log
-
-# eosd
-programs/launcher/launcher --eosd "--plugin eosio::db_plugin --mongodb-uri $DB"
-verifyErrorCode "launcher"
-sleep 60
-count=`grep -c "generated block" tn_data_00/stderr.txt`
-if [[ $count == 0 ]]; then
-  error "FAILURE - no blocks produced"
-fi
-
-# save starting block number
-getHeadBlockNum
-START_BLOCK_NUM=$HEAD_BLOCK_NUM
-
-# create 3 keys
-KEYS="$(programs/eosc/eosc create key)"
-verifyErrorCode "eosc create key"
-PRV_KEY1="$(echo "$KEYS" | awk '/Private/ {print $3}')"
-PUB_KEY1="$(echo "$KEYS" | awk '/Public/ {print $3}')"
-KEYS="$(programs/eosc/eosc create key)"
-verifyErrorCode "eosc create key"
-PRV_KEY2="$(echo "$KEYS" | awk '/Private/ {print $3}')"
-PUB_KEY2="$(echo "$KEYS" | awk '/Public/ {print $3}')"
-KEYS="$(programs/eosc/eosc create key)"
-verifyErrorCode "eosc create key"
-PRV_KEY3="$(echo "$KEYS" | awk '/Private/ {print $3}')"
-PUB_KEY3="$(echo "$KEYS" | awk '/Public/ {print $3}')"
-if [ -z "$PRV_KEY1" ] || [ -z "$PRV_KEY2" ] || [ -z "$PRV_KEY3" ] || [ -z "$PUB_KEY1" ] || [ -z "$PUB_KEY2" ] || [ -z "$PUB_KEY3" ]; then
-  error "FAILURE - create keys"
-fi
-
-#
-# Wallet Tests
-#
-
-# walletd
-programs/eos-walletd/eos-walletd --data-dir test_wallet_0 --http-server-address=127.0.0.1:8899 > test_walletd_output.log 2>&1 &
-verifyErrorCode "eos-walletd"
-WALLETD_PROC_ID=$!
-sleep 3
-
-# import into a wallet
-PASSWORD="$(programs/eosc/eosc --wallet-port 8899 wallet create --name test)"
-verifyErrorCode "eosc wallet create"
-# strip out password from output
-PASSWORD="$(echo "$PASSWORD" | awk '/PW/ {print $1}')"
-# remove leading/trailing quotes
-PASSWORD=${PASSWORD#\"}
-PASSWORD=${PASSWORD%\"}
-programs/eosc/eosc --wallet-port 8899 wallet import --name test $PRV_KEY1
-verifyErrorCode "eosc wallet import"
-programs/eosc/eosc --wallet-port 8899 wallet import --name test $PRV_KEY2
-verifyErrorCode "eosc wallet import"
-programs/eosc/eosc --wallet-port 8899 wallet import --name test $PRV_KEY3
-verifyErrorCode "eosc wallet import"
-
-# create wallet for inita
-PASSWORD_INITA="$(programs/eosc/eosc --wallet-port 8899 wallet create --name inita)"
-verifyErrorCode "eosc wallet create"
-# strip out password from output
-PASSWORD_INITA="$(echo "$PASSWORD_INITA" | awk '/PW/ {print $1}')"
-# remove leading/trailing quotes
-PASSWORD_INITA=${PASSWORD_INITA#\"}
-PASSWORD_INITA=${PASSWORD_INITA%\"}
-programs/eosc/eosc --wallet-port 8899 wallet import --name inita $INITA_PRV_KEY
-verifyErrorCode "eosc wallet import"
-
-# lock wallet
-programs/eosc/eosc --wallet-port 8899 wallet lock --name test
-verifyErrorCode "eosc wallet lock"
-
-# unlock wallet
-echo $PASSWORD | programs/eosc/eosc --wallet-port 8899 wallet unlock --name test
-verifyErrorCode "eosc wallet unlock"
-
-# lock via lock_all
-programs/eosc/eosc --wallet-port 8899 wallet lock_all
-verifyErrorCode "eosc wallet lock_all"
-
-# unlock wallet again
-echo $PASSWORD | programs/eosc/eosc --wallet-port 8899 wallet unlock --name test
-verifyErrorCode "eosc wallet unlock"
-
-# wallet list
-OUTPUT=$(programs/eosc/eosc --wallet-port 8899 wallet list)
-verifyErrorCode "eosc wallet list"
-count=`echo $OUTPUT | grep "test" | grep -c "\*"`
-if [[ $count == 0 ]]; then
-  error "FAILURE - wallet list did not include \*"
-fi
-
-# wallet keys
-OUTPUT=$(programs/eosc/eosc --wallet-port 8899 wallet keys)
-verifyErrorCode "eosc wallet keys"
-count=`echo $OUTPUT | grep -c "$PRV_KEY1"`
-if [[ $count == 0 ]]; then
-  error "FAILURE - wallet keys did not include $PRV_KEY1"
-fi
-count=`echo $OUTPUT | grep -c "$PRV_KEY2"`
-if [[ $count == 0 ]]; then
-  error "FAILURE - wallet keys did not include $PRV_KEY2"
-fi
-
-# lock via lock_all
-programs/eosc/eosc --wallet-port 8899 wallet lock_all
-verifyErrorCode "eosc wallet lock_all"
-
-# unlock wallet inita
-echo $PASSWORD_INITA | programs/eosc/eosc --wallet-port 8899 wallet unlock --name inita
-verifyErrorCode "eosc wallet unlock inita"
-OUTPUT=$(programs/eosc/eosc --wallet-port 8899 wallet keys)
-count=`echo $OUTPUT | grep -c "$INITA_PRV_KEY"`
-if [[ $count == 0 ]]; then
-  error "FAILURE - wallet keys did not include $INITA_PRV_KEY"
-fi
-
-#
-# Account and Transfer Tests
-#
-
-# create new account
-ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 create account inita testera $PUB_KEY1 $PUB_KEY3)"
-verifyErrorCode "eosc create account"
-waitForNextTransaction
-
-# verify account created
-ACCOUNT_INFO="$(echo 'db.Accounts.findOne({"name" : "testera"})' | mongo $DB)"
-verifyErrorCode "mongo get account"
-count=`echo $ACCOUNT_INFO | grep -c "staked_balance"`
-if [ $count == 0 ]; then
-  error "FAILURE - account creation failed: $ACCOUNT_INFO"
-fi
-
-# transfer
-TRANSFER_INFO="$(programs/eosc/eosc --wallet-port 8899 transfer -f inita testera 975321 "test transfer")"
-verifyErrorCode "eosc transfer"
-waitForNextTransaction
-
-# verify transfer
-ACCOUNT_INFO="$(echo 'db.Accounts.findOne({"name" : "testera"})' | mongo $DB)"
-count=`echo $ACCOUNT_INFO | grep -c "97.5321"`
-if [ $count == 0 ]; then
-  error "FAILURE - transfer failed: $ACCOUNT_INFO"
-fi
-
-# create another new account via initb
-ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 create account initb currency $PUB_KEY2 $PUB_KEY3)"
-verifyErrorCode "eosc create account"
-waitForNextTransaction
-
-## now transfer from testera to currency using keys from testera
-
-# lock via lock_all
-programs/eosc/eosc --wallet-port 8899 wallet lock_all
-verifyErrorCode "eosc wallet lock_all"
-
-# unlock wallet
-echo $PASSWORD | programs/eosc/eosc --wallet-port 8899 wallet unlock --name test
-verifyErrorCode "eosc wallet unlock"
-
-# transfer
-TRANSFER_INFO="$(programs/eosc/eosc --wallet-port 8899 transfer testera currency 975311 "test transfer a->b")"
-verifyErrorCode "eosc transfer"
-waitForNextTransaction
-getTransactionId "$TRANSFER_INFO"
-
-# verify transfer
-ACCOUNT_INFO="$(echo 'db.Accounts.findOne({"name" : "currency"})' | mongo $DB)"
-verifyErrorCode "mongo get account currency"
-count=`echo $ACCOUNT_INFO | grep -c "97.5311"`
-if [ $count == 0 ]; then
-  error "FAILURE - transfer failed: $ACCOUNT_INFO"
-fi
-
-# get accounts via public key
-ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 get accounts $PUB_KEY3)"
-verifyErrorCode "eosc get accounts pub_key3"
-count=`echo $ACCOUNT_INFO | grep -c "testera"`
-if [ $count == 0 ]; then
-  error "FAILURE - get accounts failed: $ACCOUNT_INFO"
-fi
-count=`echo $ACCOUNT_INFO | grep -c "currency"`
-if [ $count == 0 ]; then
-  error "FAILURE - get accounts failed: $ACCOUNT_INFO"
-fi
-ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 get accounts $PUB_KEY1)"
-verifyErrorCode "eosc get accounts pub_key1"
-count=`echo $ACCOUNT_INFO | grep -c "testera"`
-if [ $count == 0 ]; then
-  error "FAILURE - get accounts failed: $ACCOUNT_INFO"
-fi
-count=`echo $ACCOUNT_INFO | grep -c "currency"`
-if [ $count != 0 ]; then
-  error "FAILURE - get accounts failed: $ACCOUNT_INFO"
-fi
-
-# get servant accounts
-ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 get servants inita)"
-verifyErrorCode "eosc get servants inita"
-count=`echo $ACCOUNT_INFO | grep -c "testera"`
-if [ $count == 0 ]; then
-  error "FAILURE - get servants failed: $ACCOUNT_INFO"
-fi
-count=`echo $ACCOUNT_INFO | grep -c "currency"`
-if [ $count != 0 ]; then
-  error "FAILURE - get servants failed: $ACCOUNT_INFO"
-fi
-ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 get servants testera)"
-verifyErrorCode "eosc get servants testera"
-count=`echo $ACCOUNT_INFO | grep -c "testera"`
-if [ $count != 0 ]; then
-  error "FAILURE - get servants failed: $ACCOUNT_INFO"
-fi
-
-# get transaction
-TRANS_INFO="$(echo 'db.Transactions.findOne({"transaction_id" : "'"$TRANS_ID"'"})' | mongo $DB)"
-verifyErrorCode "mongo get transaction trans_id error: $TRANS_INFO"
-count=`echo $TRANS_INFO | grep -c "block_id"`
-if [ $count == 0 ]; then
-  error "FAILURE - get transaction trans_id failed: $TRANS_INFO"
-fi
-
-# get transaction messages
-TRANS_INFO="$(echo 'db.Messages.findOne({"transaction_id" : "'"$TRANS_ID"'"})' | mongo $DB)"
-verifyErrorCode "mongo get messages trans_id of $TRANS_INFO"
-count=`echo $TRANS_INFO | grep -c "transfer"`
-if [ $count == 0 ]; then
-  error "FAILURE - get messages trans_id failed: $TRANS_INFO"
-fi
-count=`echo $TRANS_INFO | grep -c "975311"`
-if [ $count == 0 ]; then
-  error "FAILURE - get messages trans_id failed: $TRANS_INFO"
-fi
-
-# get messages for account
-TRANS_INFO="$(echo 'db.Messages.findOne({"authorization" : {$elemMatch:{"account" : "testera" }}})' | mongo $DB)"
-verifyErrorCode "eosc get messages testera"
-count=`echo $TRANS_INFO | grep -c "$TRANS_ID"`
-if [ $count == 0 ]; then
-  error "FAILURE - get transactions testera failed: $TRANS_INFO"
-fi
-
-#
-# Currency Contract Tests
-#
-
-# verify no contract in place
-CODE_INFO="$(programs/eosc/eosc --wallet-port 8899 get code currency)"
-verifyErrorCode "eosc get code currency"
-# convert to num
-CODE_HASH="$(echo "$CODE_INFO" | awk '/code hash/ {print $3}')"
-CODE_HASH="$(echo $CODE_HASH | awk '{print toupper($0)}')"
-CODE_HASH="$(echo "ibase=16; $CODE_HASH" | bc)"
-if [ $CODE_HASH != 0 ]; then
-  error "FAILURE - get code currency failed: $CODE_INFO"
-fi
-
-# upload a contract
-INFO="$(programs/eosc/eosc --wallet-port 8899 set contract currency contracts/currency/currency.wast contracts/currency/currency.abi)"
-verifyErrorCode "eosc set contract testera"
-count=`echo $INFO | grep -c "processed"`
-if [ $count == 0 ]; then
-  error "FAILURE - set contract failed: $INFO"
-fi
-getTransactionId "$INFO"
-
-waitForNextTransaction
-# verify transaction exists
-TRANS_INFO="$(echo 'db.Transactions.findOne({"transaction_id" : "'"$TRANS_ID"'"})' | mongo $DB)"
-verifyErrorCode "mongod get transaction trans_id of $TRANS_INFO"
-
-# verify abi is set
-ACCOUNT_INFO="$(echo 'db.Accounts.findOne({"name" : "currency"})' | mongo $DB)"
-verifyErrorCode "mongo get abi currency"
-# convert to num
-count=`echo $ACCOUNT_INFO | grep abi | grep -c "transfer"`
-if [ $count == 0 ]; then
-  error "FAILURE - set contract abi failed: $ACCOUNT_INFO"
-fi
-
-# verify currency contract has proper initial balance
-INFO="$(programs/eosc/eosc --wallet-port 8899 get table currency currency account)"
-verifyErrorCode "eosc get table currency account"
-count=`echo $INFO | grep -c "1000000000"`
-if [ $count == 0 ]; then
-  error "FAILURE - get table currency account failed: $INFO"
-fi
-
-# push message to currency contract
-INFO="$(programs/eosc/eosc --wallet-port 8899 push message currency transfer '{"from":"currency","to":"inita","quantity":50}' --scope currency,inita --permission currency@active)"
-verifyErrorCode "eosc push message currency transfer"
-getTransactionId "$INFO"
-
-# verify transaction exists
-waitForNextTransaction
-TRANS_INFO="$(echo 'db.Transactions.findOne({"transaction_id" : "'"$TRANS_ID"'"})' | mongo $DB)"
-verifyErrorCode "mongo get transaction trans_id of $TRANS_INFO"
-
-# read current contract balance
-ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 get table inita currency account)"
-verifyErrorCode "eosc get table currency account"
-count=`echo $ACCOUNT_INFO | grep "balance" | grep -c "50"`
-if [ $count == 0 ]; then
-  error "FAILURE - get table inita account failed: $ACCOUNT_INFO"
-fi
-
-ACCOUNT_INFO="$(programs/eosc/eosc --wallet-port 8899 get table currency currency account)"
-verifyErrorCode "eosc get table currency account"
-count=`echo $ACCOUNT_INFO | grep "balance" | grep -c "999999950"`
-if [ $count == 0 ]; then
-  error "FAILURE - get table currency account failed: $ACCOUNT_INFO"
-fi
-
-#
-# Proxy
-#
-# not implemented
-
-# should be able to get every block from beginning to end
-getHeadBlockNum
-CURRENT_BLOCK_NUM=$HEAD_BLOCK_NUM
-NEXT_BLOCK_NUM=1
-while [ "$NEXT_BLOCK_NUM" -le "$HEAD_BLOCK_NUM" ]; do
-  INFO="$(echo 'db.Blocks.findOne({"block_num" : '"$NEXT_BLOCK_NUM"'})' | mongo $DB)"
-  verifyErrorCode "mongo get block by num $NEXT_BLOCK_NUM"
-  BLOCK_ID="$(echo "$INFO" | awk '/"block_id"/ {print $3}')"
-  # remove trailing coma
-  BLOCK_ID=${BLOCK_ID%,}
-  INFO="$(echo 'db.Blocks.findOne({"block_id" : '"$BLOCK_ID"'})' | mongo $DB)"
-  verifyErrorCode "mongo get block by id $BLOCK_ID"
-  INFO="$(echo 'db.Transactions.find({"block_id" : '"$BLOCK_ID"'}).pretty()' | mongo $DB)"
-  verifyErrorCode "mongo get transactions by block id $BLOCK_ID"
-  count=`echo $INFO | grep -c "transaction_id"`
-  if [ $count > 0 ]; then
-    TRANS_IDS="$(echo "$INFO" | awk '/transaction_id/ {print $3}')"
-    IFS=', ' read -r -a ARR <<< "$TRANS_IDS"
-    for t in "${ARR[@]}"
-    do
-      INFO="$(echo 'db.Messages.findOne({"transaction_id" : '"$t"'})' | mongo $DB)"
-      verifyErrorCode "mongo get messages by transaction id $t"
-    done
-  fi
-
-  NEXT_BLOCK_NUM=$((NEXT_BLOCK_NUM+1))
-done
-
-ASSERT_ERRORS="$(grep Assert tn_data_00/stderr.txt)"
-count=`grep -c Assert tn_data_00/stderr.txt`
-if [ $count != 0 ]; then
-  error "FAILURE - Assert in tn_data_00/stderr.txt"
-fi
-
-killAll
-cleanup
-echo SUCCESS!

tests/eosd_run_test.py

@@ -5,6 +5,7 @@ import testUtils
 import argparse
 import random
 import re
+import time
 
 ###############################################################
 # eosd_run_test
@@ -36,6 +37,7 @@ parser.add_argument('-?', action='help', default=argparse.SUPPRESS,
 parser.add_argument("-o", "--output", type=str, help="output file", default=TEST_OUTPUT_DEFAULT)
 parser.add_argument("-h", "--host", type=str, help="eosd host name", default=LOCAL_HOST)
 parser.add_argument("-p", "--port", type=int, help="eosd host port", default=DEFAULT_PORT)
+parser.add_argument("--mongoDb", help="Configure a MongoDb instance", action='store_true')
 parser.add_argument("--dumpErrorDetails",
                     help="Upon error print tn_data_*/config.ini and tn_data_*/stderr.log to stdout",
                     action='store_true')
@@ -48,10 +50,12 @@ testOutputFile=args.output
 server=args.host
 port=args.port
 debug=args.v
+enableMongo=args.mongoDb
 localTest=True if server == LOCAL_HOST else False
 testUtils.Utils.Debug=debug
 
-cluster=testUtils.Cluster(walletd=True)
+cluster=testUtils.Cluster(walletd=True, enableMongo=enableMongo)
+#cluster=testUtils.Cluster(walletd=True)
 walletMgr=testUtils.WalletMgr(True)
 cluster.killall()
 cluster.cleanup()
@@ -190,17 +194,17 @@ try:
     node=cluster.getNode(0)
     if node is None:
         errorExit("Cluster in bad state, received None node")
-
+        
     Print("Create new account %s via %s" % (testeraAccount.name, initaAccount.name))
     transId=node.createAccount(testeraAccount, initaAccount, waitForTransBlock=True)
     if transId is None:
         cmdError("eosc create account")
         errorExit("Failed to create account %s" % (testeraAccount.name))
-
+        
     Print("Verify account %s" % (testeraAccount))
     if not node.verifyAccount(testeraAccount):
         errorExit("FAILURE - account creation failed.", raw=True)
-
+        
     transferAmount=975321
     Print("Transfer funds %d from account %s to %s" % (transferAmount, initaAccount.name, testeraAccount.name))
     if node.transferFunds(initaAccount, testeraAccount, transferAmount, "test transfer") is None:
@@ -317,15 +321,25 @@ try:
     node.waitForTransIdOnNode(transId)
 
     Print("Get transaction details %s" % (transId))
-    transaction=node.getTransaction(transId)
+    transaction=None
+    if not enableMongo:
+        transaction=node.getTransaction(transId)
+    else:
+        transaction=node.getMessageFromDb(transId, retry=False)
     if transaction is None:
         cmdError("eosc get transaction trans_id")
         errorExit("Failed to retrieve transaction details %s" % (transId))
 
-    typeVal=  transaction["transaction"]["messages"][0]["type"]
-    amountVal=transaction["transaction"]["messages"][0]["data"]["amount"]
+    typeVal=None
+    amountVal=None
+    if not enableMongo:
+        typeVal=  transaction["transaction"]["messages"][0]["type"]
+        amountVal=transaction["transaction"]["messages"][0]["data"]["amount"]
+    else:
+        typeVal=  transaction["type"]
+        amountVal=transaction["data"]["amount"]
+        
     if typeVal!= "transfer" or amountVal != 975311:
-    #if transaction.tType != "transfer" or transaction.amount != 975311:
         errorExit("FAILURE - get transaction trans_id failed: %s" % (transId), raw=True)
 
     Print("Get transactions for account %s" % (testeraAccount.name))
@@ -333,9 +347,13 @@ try:
     if actualTransactions is None:
         cmdError("eosc get transactions testera")
         errorExit("Failed to get transactions by account %s" % (testeraAccount.name))
-    if len(actualTransactions) == 0:
+    # if len(actualTransactions) == 0:
+    if transId not in actualTransactions:
         errorExit("FAILURE - get transactions testera failed", raw=True)
 
+
+    Print("Currency Contract Tests")
+    Print("verify no contract in place")
     Print("Get code hash for account %s" % (currencyAccount.name))
     codeHash=node.getAccountCodeHash(currencyAccount.name)
     if codeHash is None:
@@ -353,14 +371,23 @@ try:
         cmdError("eosc set contract currency")
         errorExit("Failed to publish contract.")
 
-    Print("Get code hash for account %s" % (currencyAccount.name))
-    codeHash=node.getAccountCodeHash(currencyAccount.name)
-    if codeHash is None:
-        cmdError("eosc get code currency")
-        errorExit("Failed to get code hash for account %s" % (currencyAccount.name))
-    hashNum=int(codeHash, 16)
-    if hashNum == 0:
-        errorExit("FAILURE - get code currency failed", raw=True)
+    if not enableMongo:
+        Print("Get code hash for account %s" % (currencyAccount.name))
+        codeHash=node.getAccountCodeHash(currencyAccount.name)
+        if codeHash is None:
+            cmdError("eosc get code currency")
+            errorExit("Failed to get code hash for account %s" % (currencyAccount.name))
+            hashNum=int(codeHash, 16)
+            if hashNum == 0:
+                errorExit("FAILURE - get code currency failed", raw=True)
+    else:
+        Print("verify abi is set")
+        account=node.getEosAccountFromDb(currencyAccount.name)
+        abiName=account["abi"]["structs"][0]["name"]
+        abiActionName=account["abi"]["actions"][0]["action_name"]
+        abiType=account["abi"]["actions"][0]["type"]
+        if abiName != "transfer" or abiActionName != "transfer" or abiType != "transfer":
+            errorExit("FAILURE - get table currency account failed", raw=True)
 
     Print("Verify currency contract has proper initial balance")
     contract="currency"
@@ -494,13 +521,28 @@ try:
     Print("CurrentBlockNum: %d" % (currentBlockNum))
     Print("Request blocks 1-%d" % (currentBlockNum))
     for blockNum in range(1, currentBlockNum+1):
-        block=node.getBlock(blockNum)
+        block=node.getBlock(blockNum, retry=False)
         if block is None:
             cmdError("eosc get block")
-            errorExit("Failed to get block")
+            errorExit("mongo get block by num %d" % blockNum)
+
+        if enableMongo:
+            blockId=block["block_id"]
+            block2=node.getBlockById(blockId, retry=False)
+            if block2 is None:
+                errorExit("mongo get block by id %s" % blockId)
+
+            # TBD: getTransByBlockId() needs to handle multiple returned transactions
+            # trans=node.getTransByBlockId(blockId, retry=False)
+            # if trans is not None:
+            #     transId=testUtils.Node.getTransId(trans)
+            #     trans2=node.getMessageFromDb(transId)
+            #     if trans2 is None:
+            #         errorExit("mongo get messages by transaction id %s" % (transId))
+            
 
     Print("Request invalid block numbered %d" % (currentBlockNum+100))
-    block=node.getBlock(currentBlockNum+100, silent=True)
+    block=node.getBlock(currentBlockNum+100, silentErrors=True)
     if block is not None:
         errorExit("ERROR: Received block where not expected")
     else: