Enhancement: Trim the indexer images and use the sandbox instead of custom dockers

.test-env

@@ -0,0 +1,14 @@
+# Configs for testing repo download:
+SDK_TESTING_URL="https://github.com/algorand/algorand-sdk-testing"
+SDK_TESTING_BRANCH="master"
+SDK_TESTING_HARNESS="test-harness"
+
+VERBOSE_HARNESS=0
+
+# WARNING: If set to 1, new features will be LOST when downloading the test harness.
+# REGARDLESS: modified features are ALWAYS overwritten.
+REMOVE_LOCAL_FEATURES=0
+
+# WARNING: Be careful when turning on the next variable.
+# In that case you'll need to provide all variables expected by `algorand-sdk-testing`'s `.env`
+OVERWRITE_TESTING_ENVIRONMENT=0

Dockerfile

@@ -11,5 +11,4 @@ RUN pip install . -q \
     && pip install -r requirements.txt -q
 
 # Run integration tests
-CMD ["/bin/bash", "-c", "make unit && make integration"]
-
+CMD ["/bin/bash", "-c", "python --version && make unit && make integration"]

Makefile

@@ -1,11 +1,24 @@
-UNITS = "@unit.abijson or @unit.abijson.byname or @unit.algod or @unit.algod.ledger_refactoring or @unit.applications or @unit.atc_method_args or @unit.atomic_transaction_composer or @unit.dryrun or @unit.dryrun.trace.application or @unit.feetest or @unit.indexer or @unit.indexer.ledger_refactoring or @unit.indexer.logs or @unit.offline or @unit.rekey or @unit.transactions.keyreg or @unit.responses or @unit.responses.231 or @unit.tealsign or @unit.transactions or @unit.transactions.payment or @unit.responses.unlimited_assets or @unit.sourcemap"
+UNIT_TAGS :=  "$(subst :, or ,$(shell awk '{print $2}' tests/unit.tags | paste -s -d: -))"
+INTEGRATION_TAGS := "$(subst :, or ,$(shell awk '{print $2}' tests/integration.tags | paste -s -d: -))"
+
 unit:
-	behave --tags=$(UNITS) tests -f progress2
+	behave --tags=$(UNIT_TAGS) tests -f progress2
 
-INTEGRATIONS = "@abi or @algod or @applications or @applications.verified or @assets or @auction or @c2c or @compile or @dryrun or @dryrun.testing or @indexer or @indexer.231 or @indexer.applications or @kmd or @rekey_v1 or @send.keyregtxn or @send or @compile.sourcemap"
 integration:
-	behave --tags=$(INTEGRATIONS) tests -f progress2
+	behave --tags=$(INTEGRATION_TAGS) tests -f progress2 --no-capture
+
+display-all-python-steps:
+	find tests/steps -name "*.py" | xargs grep "behave" 2>/dev/null | cut -d: -f1 | sort | uniq | xargs awk "/@(given|step|then|when)/,/[)]/" | grep -E "(\".+\"|\'.+\')"
+
+harness:
+	./test-harness.sh
 
 PYTHON_VERSION ?= 3.8
-docker-test:
-	PYTHON_VERSION='$(PYTHON_VERSION)' ./run_integration.sh
+docker-pysdk-build:
+	docker build -t py-sdk-testing --build-arg PYTHON_VERSION="${PYTHON_VERSION}" .
+
+docker-pysdk-run:
+	docker ps -a
+	docker run -it --network host py-sdk-testing:latest
+
+docker-test: harness docker-pysdk-build docker-pysdk-run

test-harness.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+START=$(date "+%s")
+
+THIS=$(basename "$0")
+ENV_FILE=".test-env"
+TEST_DIR="tests"
+
+set -a
+source "$ENV_FILE"
+set +a
+
+rootdir=$(dirname "$0")
+pushd "$rootdir"
+
+## Reset test harness
+if [ -d "$SDK_TESTING_HARNESS" ]; then
+  pushd "$SDK_TESTING_HARNESS"
+  ./scripts/down.sh
+  popd
+  rm -rf "$SDK_TESTING_HARNESS"
+else
+  echo "$THIS: directory $SDK_TESTING_HARNESS does not exist - NOOP"
+fi
+
+git clone --depth 1 --single-branch --branch "$SDK_TESTING_BRANCH" "$SDK_TESTING_URL" "$SDK_TESTING_HARNESS"
+
+
+if [[ $OVERWRITE_TESTING_ENVIRONMENT == 1 ]]; then
+  echo "$THIS: OVERWRITE replaced $SDK_TESTING_HARNESS/.env with $ENV_FILE:"
+  cp "$ENV_FILE" "$SDK_TESTING_HARNESS"/.env
+fi
+
+## Copy feature files into the project resources
+if [[ $REMOVE_LOCAL_FEATURES == 1 ]]; then
+  echo "$THIS: OVERWRITE wipes clean $TEST_DIR/features"
+  if [[ $VERBOSE_HARNESS == 1 ]]; then
+    ( tree $TEST_DIR/features && echo "$THIS: see the previous for files deleted" ) || true
+  fi
+  rm -rf $TEST_DIR/features
+fi
+mkdir -p $TEST_DIR/features
+cp -r "$SDK_TESTING_HARNESS"/features/* $TEST_DIR/features
+if [[ $VERBOSE_HARNESS == 1 ]]; then
+  ( tree $TEST_DIR/features && echo "$THIS: see the previous for files copied over" ) || true
+fi
+echo "$THIS: seconds it took to get to end of cloning and copying: $(($(date "+%s") - START))s"
+
+## Start test harness environment
+pushd "$SDK_TESTING_HARNESS"
+./scripts/up.sh
+popd
+echo "$THIS: seconds it took to finish testing sdk's up.sh: $(($(date "+%s") - START))s"
+echo ""
+echo "--------------------------------------------------------------------------------"
+echo "|"
+echo "|    To run sandbox commands, cd into $SDK_TESTING_HARNESS/.sandbox             "
+echo "|"
+echo "--------------------------------------------------------------------------------"

tests/integration.tags

@@ -0,0 +1,15 @@
+@abi
+@algod
+@applications
+@applications.verified
+@assets
+@auction
+@c2c
+@compile
+@compile.sourcemap
+@dryrun
+@dryrun.testing
+@kmd
+@rekey_v1
+@send
+@send.keyregtxn

tests/steps/account_v2_steps.py

@@ -1,6 +1,6 @@
 from typing import Union
 
-from algosdk import account, constants, encoding, logic
+from algosdk import account, encoding, logic
 from algosdk.future import transaction
 from behave import given, then, when
 import tests.steps.other_v2_steps  # Imports MaybeString
@@ -33,57 +33,6 @@ def acc_info2(context, account):
     context.response = context.acl.account_info(account)
 
 
-@then(
-    'The account has {num} assets, the first is asset {index} has a frozen status of "{frozen}" and amount {units}.'
-)
-def lookup_account_check(context, num, index, frozen, units):
-    assert len(context.response["account"]["assets"]) == int(num)
-    assert context.response["account"]["assets"][0]["asset-id"] == int(index)
-    assert context.response["account"]["assets"][0]["is-frozen"] == (
-        frozen == "true"
-    )
-    assert context.response["account"]["assets"][0]["amount"] == int(units)
-
-
-@then(
-    'The account created {num} assets, the first is asset {index} is named "{name}" with a total amount of {total} "{unit}"'
-)
-def lookup_account_check_created(context, num, index, name, total, unit):
-    assert len(context.response["account"]["created-assets"]) == int(num)
-    assert context.response["account"]["created-assets"][0]["index"] == int(
-        index
-    )
-    assert (
-        context.response["account"]["created-assets"][0]["params"]["name"]
-        == name
-    )
-    assert (
-        context.response["account"]["created-assets"][0]["params"]["unit-name"]
-        == unit
-    )
-    assert context.response["account"]["created-assets"][0]["params"][
-        "total"
-    ] == int(total)
-
-
-@then(
-    "The account has {μalgos} μalgos and {num} assets, {assetid} has {assetamount}"
-)
-def lookup_account_check_holdings(context, μalgos, num, assetid, assetamount):
-    assert context.response["account"]["amount"] == int(μalgos)
-    assert len(context.response["account"].get("assets", [])) == int(num)
-    if int(num) > 0:
-        assets = context.response["account"]["assets"]
-        for a in assets:
-            if a["asset-id"] == int(assetid):
-                assert a["amount"] == int(assetamount)
-
-
-@when('I use {indexer} to lookup account "{account}" at round {round}')
-def icl_lookup_account_at_round(context, indexer, account, round):
-    context.response = context.icls[indexer].account_info(account, int(round))
-
-
 @when(
     'we make a Lookup Account by ID call against account "{account}" with round {block}'
 )
@@ -94,7 +43,7 @@ def lookup_account(context, account, block):
 @when(
     'we make a Lookup Account by ID call against account "{account}" with exclude "{exclude:MaybeString}"'
 )
-def lookup_account(context, account, exclude):
+def lookup_account2(context, account, exclude):
     context.response = context.icl.account_info(account, exclude=exclude)
 
 
@@ -262,151 +211,6 @@ def search_accounts3(
     context.response = context.icl.accounts(exclude=exclude)
 
 
-@when(
-    'I use {indexer} to search for an account with {assetid}, {limit}, {currencygt}, {currencylt}, "{auth_addr:MaybeString}", {application_id}, "{include_all:MaybeBool}" and token "{token:MaybeString}"'
-)
-def icl_search_accounts_with_auth_addr_and_app_id_and_include_all(
-    context,
-    indexer,
-    assetid,
-    limit,
-    currencygt,
-    currencylt,
-    auth_addr,
-    application_id,
-    include_all,
-    token,
-):
-    context.response = context.icls[indexer].accounts(
-        asset_id=int(assetid),
-        limit=int(limit),
-        next_page=token,
-        min_balance=int(currencygt),
-        max_balance=int(currencylt),
-        auth_addr=auth_addr,
-        application_id=int(application_id),
-        include_all=include_all,
-    )
-
-
-@when(
-    'I use {indexer} to search for an account with {assetid}, {limit}, {currencygt}, {currencylt}, "{auth_addr:MaybeString}", {application_id} and token "{token:MaybeString}"'
-)
-def icl_search_accounts_with_auth_addr_and_app_id(
-    context,
-    indexer,
-    assetid,
-    limit,
-    currencygt,
-    currencylt,
-    auth_addr,
-    application_id,
-    token,
-):
-    context.response = context.icls[indexer].accounts(
-        asset_id=int(assetid),
-        limit=int(limit),
-        next_page=token,
-        min_balance=int(currencygt),
-        max_balance=int(currencylt),
-        auth_addr=auth_addr,
-        application_id=int(application_id),
-    )
-
-
-@when(
-    'I use {indexer} to search for an account with {assetid}, {limit}, {currencygt}, {currencylt} and token "{token:MaybeString}"'
-)
-def icl_search_accounts_legacy(
-    context, indexer, assetid, limit, currencygt, currencylt, token
-):
-    context.response = context.icls[indexer].accounts(
-        asset_id=int(assetid),
-        limit=int(limit),
-        next_page=token,
-        min_balance=int(currencygt),
-        max_balance=int(currencylt),
-    )
-
-
-@then(
-    "I get the next page using {indexer} to search for an account with {assetid}, {limit}, {currencygt} and {currencylt}"
-)
-def search_accounts_nex(
-    context, indexer, assetid, limit, currencygt, currencylt
-):
-    context.response = context.icls[indexer].accounts(
-        asset_id=int(assetid),
-        limit=int(limit),
-        min_balance=int(currencygt),
-        max_balance=int(currencylt),
-        next_page=context.response["next-token"],
-    )
-
-
-@then(
-    'There are {num}, the first has {pendingrewards}, {rewardsbase}, {rewards}, {withoutrewards}, "{address}", {amount}, "{status}", "{sigtype:MaybeString}"'
-)
-def check_search_accounts(
-    context,
-    num,
-    pendingrewards,
-    rewardsbase,
-    rewards,
-    withoutrewards,
-    address,
-    amount,
-    status,
-    sigtype,
-):
-    assert len(context.response["accounts"]) == int(num)
-    assert context.response["accounts"][0]["pending-rewards"] == int(
-        pendingrewards
-    )
-    assert context.response["accounts"][0].get("rewards-base", 0) == int(
-        rewardsbase
-    )
-    assert context.response["accounts"][0]["rewards"] == int(rewards)
-    assert context.response["accounts"][0][
-        "amount-without-pending-rewards"
-    ] == int(withoutrewards)
-    assert context.response["accounts"][0]["address"] == address
-    assert context.response["accounts"][0]["amount"] == int(amount)
-    assert context.response["accounts"][0]["status"] == status
-    assert context.response["accounts"][0].get("sig-type", "") == sigtype
-
-
-@then(
-    'The first account is online and has "{address}", {keydilution}, {firstvalid}, {lastvalid}, "{votekey}", "{selectionkey}"'
-)
-def check_search_accounts_online(
-    context, address, keydilution, firstvalid, lastvalid, votekey, selectionkey
-):
-    assert context.response["accounts"][0]["status"] == "Online"
-    assert context.response["accounts"][0]["address"] == address
-    assert context.response["accounts"][0]["participation"][
-        "vote-key-dilution"
-    ] == int(keydilution)
-    assert context.response["accounts"][0]["participation"][
-        "vote-first-valid"
-    ] == int(firstvalid)
-    assert context.response["accounts"][0]["participation"][
-        "vote-last-valid"
-    ] == int(lastvalid)
-    assert (
-        context.response["accounts"][0]["participation"][
-            "vote-participation-key"
-        ]
-        == votekey
-    )
-    assert (
-        context.response["accounts"][0]["participation"][
-            "selection-participation-key"
-        ]
-        == selectionkey
-    )
-
-
 @when("we make any SearchAccounts call")
 def search_accounts_any(context):
     context.response = context.icl.accounts(asset_id=2)