chore: misc changes in test

apps/dashboard/cypress/e2e/batch-payments/index.cy.ts → apps/dashboard/cypress/e2e/batch-payments/batch-payments.cy.ts

@@ -13,7 +13,7 @@ describe("CSV Upload Component Test", () => {
     cy.visit("/batch-payments")
   })
 
-  it("uploads a CSV file via input and checks transactions", () => {
+  it("Batch Payments Test", () => {
     cy.get("[data-testid=csv-upload-input]").selectFile("cypress/fixtures/template.csv")
     cy.get("[data-testid=confirm-batch-payments-btn]").click()
     cy.get("[data-testid=batch-payments-modal-message]").should(
@@ -37,7 +37,6 @@ describe("CSV Upload Component Test", () => {
         })
 
         expectedTransactions.forEach((expectedTransaction) => {
-          // Exclude the special case transactions
           if (
             !btcPaymentInUSDCurrency.some(
               (btcTx) =>

apps/dashboard/cypress/e2e/e2e.cy.ts

@@ -1,3 +1,4 @@
 /* eslint-disable import/no-unassigned-import */
 import "./api-keys/api-keys.cy"
 import "./callback/callback.cy"
+import "./batch-payments/batch-payments.cy"

apps/dashboard/cypress/support/commands.ts

@@ -1,4 +1,5 @@
 /// <reference types="cypress" />
+import { CORE_URL } from "./test-data"
 
 type Transaction = {
   settlementAmount: number
@@ -50,7 +51,7 @@ Cypress.Commands.add("loginAndGetToken", (phone, code) => {
   cy.flushRedis()
   cy.request({
     method: "POST",
-    url: "http://localhost:4455/auth/phone/login",
+    url: `${CORE_URL}/auth/phone/login`,
     body: {
       phone,
       code,
@@ -64,7 +65,7 @@ Cypress.Commands.add("loginAndGetToken", (phone, code) => {
 Cypress.Commands.add("getTransactions", (authToken, numberOfTransactions) => {
   cy.request({
     method: "POST",
-    url: "http://localhost:4455/graphql",
+    url: `${CORE_URL}/graphql`,
     headers: {
       "Authorization": `Bearer ${authToken}`,
       "Content-Type": "application/json",

apps/dashboard/cypress/support/test-data.ts

@@ -4,9 +4,10 @@ export const testData = {
   CALLBACK_URL: "https://www.google.com/",
   PHONE: "+16505554350",
   CODE: "000000",
-  CORE_URL: "http://localhost:4455",
 }
 
+export const CORE_URL = "http://localhost:4455"
+
 export const expectedTransactions = [
   {
     settlementAmount: -100,

dev/Tiltfile

@@ -185,7 +185,8 @@ local_resource(
     "oathkeeper",
     "kratos",
     "api",
-    "init-test-user"
+    "init-test-user",
+    "init-onchain"
   ]
 )
 

dev/helpers/onchain.sh

@@ -2,41 +2,6 @@ DEV_DIR="$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
 source "${DEV_DIR}/helpers/gql.sh"
 
 
-check_for_onchain_initiated_settled() {
-  local token_name=$1
-  local wallet_id=$2
-  local first=${3:-"1"}
-
-  variables=$(
-  jq -n \
-  --argjson first "$first" \
-  '{"first": $first}'
-  )
-  transactions="$(exec_graphql "$token_name" "transactions" "$variables")"
-  echo "$transactions"
-}
-
-
-retry() {
-  local attempts=$1
-  shift
-  local delay=$1
-  shift
-  local i
-
-  for ((i = 0; i < attempts; i++)); do
-    run "$@"
-
-    if [[ "$status" -eq 0 ]]; then
-      return 0
-    fi
-    sleep "$delay"
-  done
-
-  echo "Command \"$*\" failed $attempts times. Output: $output"
-  false
-}
-
 fund_user_onchain() {
   local token=$1
   local wallet_currency=$2
@@ -51,15 +16,34 @@ fund_user_onchain() {
     --arg wallet_id "$wallet_id" \
     '{input: {walletId: $wallet_id}}'
   )
-  echo "Executing GraphQL query for on-chain address creation"
+
   response=$(exec_graphql "$token" 'on-chain-address-create' "$variables")
-  echo "Parsing address from the response"
   address=$(echo "$response" | jq -r '.data.onChainAddressCreate.address')
   [[ "${address}" != "null" ]] || exit 1
 
-  echo "Sending BTC to address: $address"
-  bitcoin_signer_cli -generate 101
-  bitcoin_signer_cli sendtoaddress "$address" "$btc_amount_in_btc"
-  bitcoin_signer_cli -generate 101
-  check_for_onchain_initiated_settled $token $wallet_id
+  bitcoin_cli sendtoaddress "$address" "$btc_amount_in_btc"
+  bitcoin_cli -generate 4
+
+  variables=$(
+  jq -n \
+  --argjson first "1" \
+  '{"first": $first}'
+  )
+  for i in {1..60}; do
+    response=$(exec_graphql "$token" 'transactions' "$variables")
+    echo "$response"
+    jq_query='.data.me.defaultAccount.transactions.edges[] | select(.node.initiationVia.address == $address) .node'
+    transaction_info=$(echo $response \
+      | jq -r --arg address "$address" "$jq_query")
+
+    settled_status=$(echo "$transaction_info" | jq -r ".status")
+    settled_currency=$(echo "$transaction_info" | jq -r ".settlementCurrency")
+
+    if [[ "${settled_status}" == "SUCCESS" && "${settled_currency}" == "$wallet_currency" ]]; then
+      echo "Transaction successful with correct settlement currency"
+      break
+    fi
+
+    sleep 1
+  done
 }