Update tests to run using latest sdk version

Author: benalleng

integration_test/payjoin_cli_receive_integration_test.dart

@@ -17,53 +17,43 @@
 ///      mobile wallet, and starts a mobile sender session.
 ///   3. payjoin-cli picks up the request, processes it, and posts a proposal
 ///      back to the directory.
-///   4. The mobile sender polls, picks up the proposal, signs and broadcasts
-///      the final tx, reaching PayjoinStatus.completed.
+///   4. The mobile sender's automatic poll loop picks up the proposal, signs
+///      and broadcasts the final tx, reaching PayjoinStatus.completed.
 ///
 /// Prerequisites:
-///   - Mobile wallet funded with testnet3 tBTC (TEST_ALICE_MNEMONIC in .env)
+///   - Mobile wallet funded with testnet3 tBTC (TEST_ALICE_MNEMONIC)
 ///   - payjoin-cli receiver already running (managed by the shell script)
 ///
-/// Environment variables:
-///   TEST_ALICE_MNEMONIC   Mobile wallet mnemonic (needs testnet3 tBTC)
-///   PJ_BIP21_URI          BIP21 pjURI from payjoin-cli (set by script)
+/// Environment variables (passed via --dart-define / --dart-define-from-file):
+///   TEST_ALICE_MNEMONIC          Mobile wallet mnemonic (needs testnet3 tBTC)
+///   PJ_BIP21_URI                 BIP21 pjURI from payjoin-cli (set by script)
+///   PAYJOIN_CLI_SEND_AMOUNT_SAT  Amount in sat (default: 2000)
 library;
 
 import 'dart:async';
 import 'dart:io';
 
-import 'package:bb_mobile/core/blockchain/data/datasources/bdk_bitcoin_blockchain_datasource.dart';
-import 'package:bb_mobile/core/blockchain/domain/ports/electrum_server_port.dart';
 import 'package:bb_mobile/core/fees/domain/fees_entity.dart';
-import 'package:bb_mobile/core/payjoin/data/datasources/local_payjoin_datasource.dart';
-import 'package:bb_mobile/core/payjoin/data/datasources/pdk_payjoin_datasource.dart';
 import 'package:bb_mobile/core/payjoin/domain/entity/payjoin.dart';
 import 'package:bb_mobile/core/payjoin/domain/repositories/payjoin_repository.dart';
 import 'package:bb_mobile/core/payjoin/domain/usecases/send_with_payjoin_usecase.dart';
 import 'package:bb_mobile/core/seed/data/repository/seed_repository.dart';
 import 'package:bb_mobile/core/settings/domain/settings_entity.dart';
 import 'package:bb_mobile/core/utils/constants.dart';
-import 'package:bb_mobile/core/wallet/data/repositories/bitcoin_wallet_repository.dart';
 import 'package:bb_mobile/core/wallet/data/repositories/wallet_address_repository.dart';
 import 'package:bb_mobile/core/wallet/data/repositories/wallet_repository.dart';
 import 'package:bb_mobile/core/wallet/domain/entities/wallet.dart';
 import 'package:bb_mobile/features/send/domain/usecases/prepare_bitcoin_send_usecase.dart';
 import 'package:bb_mobile/features/settings/domain/usecases/set_environment_usecase.dart';
 import 'package:bb_mobile/locator.dart';
 import 'package:bb_mobile/main.dart';
-import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:payjoin_flutter/send.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:test/test.dart';
 
-// Compile-time defines passed via --dart-define (required for device-based tests
-// where Platform.environment is unavailable, e.g. Android).
 const _dartDefines = <String, String>{
   'PJ_BIP21_URI': String.fromEnvironment('PJ_BIP21_URI'),
   'TEST_ALICE_MNEMONIC': String.fromEnvironment('TEST_ALICE_MNEMONIC'),
-  'TEST_BOB_MNEMONIC': String.fromEnvironment('TEST_BOB_MNEMONIC'),
   'PAYJOIN_CLI_SEND_AMOUNT_SAT':
       String.fromEnvironment('PAYJOIN_CLI_SEND_AMOUNT_SAT'),
 };
@@ -72,17 +62,14 @@ String _env(String key, {String? fallback}) {
   final dartVal = _dartDefines[key];
   final val = (dartVal != null && dartVal.isNotEmpty)
       ? dartVal
-      : Platform.environment[key] ?? dotenv.env[key];
+      : Platform.environment[key];
   if (val != null && val.isNotEmpty) return val;
   if (fallback != null) return fallback;
   throw Exception('Required environment variable $key is not set');
 }
 
 Future<void> main({bool isInitialized = false}) async {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  // NOTE: Bull.init() and locator<> calls are deferred to setUpAll() so that
-  // the flutter-test VM "loading" pre-check can call main() on the Linux host
-  // without trying to dlopen libark_wallet.so (which only exists on Android).
 
   late String mobileWalletMnemonic;
   late String pjBip21Uri;
@@ -146,9 +133,6 @@ Future<void> main({bool isInitialized = false}) async {
       debugPrint('[integration] Using pjURI: $pjBip21Uri');
       expect(pjBip21Uri, contains('pj='));
 
-      final parsedUri = Uri.parse(pjBip21Uri);
-      final recipientAddress = parsedUri.path;
-
       final senderCompletedCompleter = Completer<bool>();
       final payjoinSub = payjoinRepository.payjoinStream.listen((payjoin) {
         debugPrint(
@@ -161,24 +145,10 @@ Future<void> main({bool isInitialized = false}) async {
         }
       });
 
-      final localDatasource = locator<LocalPayjoinDatasource>();
-      final bitcoinWalletRepository = locator<BitcoinWalletRepository>();
-      final blockchain = locator<BdkBitcoinBlockchainDatasource>();
-      final dio = Dio();
-      const electrumServer = ElectrumServer(
-        url: ApiServiceConstants.publicElectrumTestUrlTwo,
-        priority: 1,
-        retry: 5,
-        timeout: 5,
-        stopGap: 20,
-        validateDomain: true,
-        isCustom: false,
-      );
-
       try {
         final preparedSend = await prepareBitcoinSendUsecase.execute(
           walletId: mobileWallet.id,
-          address: recipientAddress,
+          address: Uri.parse(pjBip21Uri).path,
           amountSat: amountSat,
           networkFee: const NetworkFee.relative(networkFeesSatPerVb),
           ignoreUnspendableInputs: false,
@@ -195,59 +165,25 @@ Future<void> main({bool isInitialized = false}) async {
         debugPrint('[integration] Mobile sender created: ${sender.id}');
         expect(sender.status, PayjoinStatus.requested);
 
-        // --- Step 1: post the original PSBT to the directory ---
-        final senderModel = await localDatasource.fetchSender(sender.id);
-        expect(senderModel, isNotNull, reason: 'Sender model not found in DB');
-        final payjoinSender = Sender.fromJson(json: senderModel!.sender);
-
-        debugPrint('[integration] Posting payjoin request to directory...');
-        final getContext = await PdkPayjoinDatasource.request(
-          sender: payjoinSender,
-          dio: dio,
+        // Sender's background poll loop posts the original PSBT, picks up the
+        // CLI's proposal, signs it, and broadcasts — all driven by the
+        // PdkPayjoinDatasource session loop. We just wait for completion.
+        final completed = await senderCompletedCompleter.future.timeout(
+          Duration(seconds: PayjoinConstants.directoryPollingInterval * 20),
+          onTimeout: () => false,
         );
-        debugPrint('[integration] Request posted, polling for CLI proposal...');
-
-        // --- Step 2: poll until the CLI receiver posts a proposal ---
-        String? proposalPsbt;
-        for (int i = 0; i < 18; i++) {
-          proposalPsbt = await PdkPayjoinDatasource.getProposalPsbt(
-            context: getContext,
-            dio: dio,
-          );
-          if (proposalPsbt != null) break;
-          debugPrint(
-              '[integration] No proposal yet, retrying (${i + 1}/18)...');
-          await Future.delayed(
-            const Duration(seconds: PayjoinConstants.directoryPollingInterval),
-          );
-        }
         expect(
-          proposalPsbt,
-          isNotNull,
-          reason: 'CLI did not post a payjoin proposal in time',
-        );
-        debugPrint('[integration] Received CLI proposal, signing...');
-
-        // --- Step 3: sign the proposal PSBT and broadcast ---
-        final signedProposalPsbt = await bitcoinWalletRepository.signPsbt(
-          proposalPsbt!,
-          walletId: mobileWallet.id,
-        );
-        debugPrint('[integration] Proposal signed, broadcasting...');
-
-        final txId = await blockchain.broadcastPsbt(
-          signedProposalPsbt,
-          electrumServer: electrumServer,
+          completed,
+          isTrue,
+          reason: 'Mobile sender did not reach completed status — '
+              'CLI receiver may not have posted a proposal in time',
         );
-        debugPrint('[integration] Payjoin tx broadcast: $txId');
-        expect(txId, isNotEmpty, reason: 'Broadcast returned empty txId');
       } finally {
         await payjoinSub.cancel();
-        dio.close();
       }
     },
     timeout: const Timeout(
-      Duration(seconds: PayjoinConstants.directoryPollingInterval * 20),
+      Duration(seconds: PayjoinConstants.directoryPollingInterval * 25),
     ),
   );
 }

integration_test/payjoin_cli_send_integration_test.dart

@@ -45,7 +45,6 @@ import 'package:bb_mobile/features/settings/domain/usecases/set_environment_usec
 import 'package:bb_mobile/locator.dart';
 import 'package:bb_mobile/main.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:test/test.dart';
 
@@ -59,7 +58,7 @@ String _env(String key, {String? fallback}) {
   final dartVal = _dartDefines[key];
   final val = (dartVal != null && dartVal.isNotEmpty)
       ? dartVal
-      : Platform.environment[key] ?? dotenv.env[key];
+      : Platform.environment[key];
   if (val != null && val.isNotEmpty) return val;
   if (fallback != null) return fallback;
   throw Exception('Required environment variable $key is not set');

scripts/payjoin_cli_receive_test.sh

@@ -141,6 +141,7 @@ echo "[script] Using device: $DEVICE_ID"
 
 fvm flutter test \
   --device-id="$DEVICE_ID" \
+  --dart-define-from-file=.env \
   --dart-define="PJ_BIP21_URI=$BIP21_URI" \
   integration_test/payjoin_cli_receive_integration_test.dart \
   --reporter=compact

scripts/payjoin_cli_send_test.sh

@@ -131,6 +131,7 @@ echo "[script] Using device: $DEVICE_ID"
 echo "[script] Starting Flutter integration test (mobile receiver)..."
 fvm flutter test \
   --device-id="$DEVICE_ID" \
+  --dart-define-from-file=.env \
   --dart-define="PAYJOIN_CLI_SEND_AMOUNT_SAT=$AMOUNT_SAT" \
   integration_test/payjoin_cli_send_integration_test.dart \
   --reporter=compact \