diff --git a/android/libs/api-sources.jar b/android/libs/api-sources.jar index c9213de..9068770 100644 Binary files a/android/libs/api-sources.jar and b/android/libs/api-sources.jar differ diff --git a/android/libs/api.aar b/android/libs/api.aar index 07877d6..16b8f31 100644 Binary files a/android/libs/api.aar and b/android/libs/api.aar differ diff --git a/ios/Api.xcframework/Info.plist b/ios/Api.xcframework/Info.plist index 1a9d8ff..9d3fc23 100644 --- a/ios/Api.xcframework/Info.plist +++ b/ios/Api.xcframework/Info.plist @@ -8,32 +8,32 @@ BinaryPath Api.framework/Api LibraryIdentifier - ios-arm64_x86_64-simulator + ios-arm64 LibraryPath Api.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform ios - SupportedPlatformVariant - simulator BinaryPath Api.framework/Api LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath Api.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator CFBundlePackageType diff --git a/ios/Api.xcframework/ios-arm64/Api.framework/Api b/ios/Api.xcframework/ios-arm64/Api.framework/Api index ad8975e..d6db685 100644 Binary files a/ios/Api.xcframework/ios-arm64/Api.framework/Api and b/ios/Api.xcframework/ios-arm64/Api.framework/Api differ diff --git a/ios/Api.xcframework/ios-arm64/Api.framework/Headers/Api.h b/ios/Api.xcframework/ios-arm64/Api.framework/Headers/Api.h index f0d42d1..09008c9 100644 --- a/ios/Api.xcframework/ios-arm64/Api.framework/Headers/Api.h +++ b/ios/Api.xcframework/ios-arm64/Api.framework/Headers/Api.h @@ -1,7 +1,7 @@ // Objective-C API for talking to the following Go packages // -// github.com/konstantinullrich/bitbox_flutter/api +// github.com/DFXswiss/bitbox_flutter/api // // File is generated by gomobile bind. Do not edit. #ifndef __Api_FRAMEWORK_H__ diff --git a/ios/Api.xcframework/ios-arm64/Api.framework/Headers/Api.objc.h b/ios/Api.xcframework/ios-arm64/Api.framework/Headers/Api.objc.h index 0f80579..d090f8b 100644 --- a/ios/Api.xcframework/ios-arm64/Api.framework/Headers/Api.objc.h +++ b/ios/Api.xcframework/ios-arm64/Api.framework/Headers/Api.objc.h @@ -1,5 +1,5 @@ -// Objective-C API for talking to github.com/konstantinullrich/bitbox_flutter/api Go package. -// gobind -lang=objc github.com/konstantinullrich/bitbox_flutter/api +// Objective-C API for talking to github.com/DFXswiss/bitbox_flutter/api Go package. +// gobind -lang=objc github.com/DFXswiss/bitbox_flutter/api // // File is generated by gobind. Do not edit. diff --git a/ios/Api.xcframework/ios-arm64/Api.framework/Info.plist b/ios/Api.xcframework/ios-arm64/Api.framework/Info.plist index eecabd6..83959d6 100644 --- a/ios/Api.xcframework/ios-arm64/Api.framework/Info.plist +++ b/ios/Api.xcframework/ios-arm64/Api.framework/Info.plist @@ -9,9 +9,9 @@ MinimumOSVersion 100.0 CFBundleShortVersionString - 0.0.1778239382 + 0.0.1779133764 CFBundleVersion - 0.0.1778239382 + 0.0.1779133764 CFBundlePackageType FMWK diff --git a/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Api b/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Api index 665dcb9..0914e5a 100644 Binary files a/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Api and b/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Api differ diff --git a/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Headers/Api.h b/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Headers/Api.h index f0d42d1..09008c9 100644 --- a/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Headers/Api.h +++ b/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Headers/Api.h @@ -1,7 +1,7 @@ // Objective-C API for talking to the following Go packages // -// github.com/konstantinullrich/bitbox_flutter/api +// github.com/DFXswiss/bitbox_flutter/api // // File is generated by gomobile bind. Do not edit. #ifndef __Api_FRAMEWORK_H__ diff --git a/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Headers/Api.objc.h b/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Headers/Api.objc.h index 0f80579..d090f8b 100644 --- a/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Headers/Api.objc.h +++ b/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Headers/Api.objc.h @@ -1,5 +1,5 @@ -// Objective-C API for talking to github.com/konstantinullrich/bitbox_flutter/api Go package. -// gobind -lang=objc github.com/konstantinullrich/bitbox_flutter/api +// Objective-C API for talking to github.com/DFXswiss/bitbox_flutter/api Go package. +// gobind -lang=objc github.com/DFXswiss/bitbox_flutter/api // // File is generated by gobind. Do not edit. diff --git a/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Info.plist b/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Info.plist index eecabd6..fd4fa65 100644 --- a/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Info.plist +++ b/ios/Api.xcframework/ios-arm64_x86_64-simulator/Api.framework/Info.plist @@ -9,9 +9,9 @@ MinimumOSVersion 100.0 CFBundleShortVersionString - 0.0.1778239382 + 0.0.1779133765 CFBundleVersion - 0.0.1778239382 + 0.0.1779133765 CFBundlePackageType FMWK diff --git a/lib/testing/bitbox_testkit.dart b/lib/testing/bitbox_testkit.dart index 89522d2..9846b16 100644 --- a/lib/testing/bitbox_testkit.dart +++ b/lib/testing/bitbox_testkit.dart @@ -180,66 +180,6 @@ class SimulatedBitboxPlatform extends BitboxUsbPlatform { bool _isOpen = false; bool _channelHashVerified; - static SimulatedBitboxPlatform install({ - List? devices, - Duration defaultDelay = Duration.zero, - bool requireOpen = true, - bool channelHashVerified = false, - bool startScanResult = true, - bool permissionResult = true, - bool openResult = true, - bool initResult = true, - bool channelHashVerifyResult = true, - bool supportsETHResult = true, - bool supportsERC20Result = true, - bool supportsLTCResult = true, - String? channelHash, - Uint8List? masterFingerprint, - String? btcXPub, - String? btcPsbt, - Uint8List? btcMessageSignature, - String? ethAddress, - Uint8List? ethTransactionSignature, - Uint8List? ethEip1559Signature, - Uint8List? ethRlpSignature, - Uint8List? ethMessageSignature, - Uint8List? ethTypedMessageSignature, - Map? delays, - Map? errors, - Map? behaviors, - }) { - final platform = SimulatedBitboxPlatform( - devices: devices, - defaultDelay: defaultDelay, - requireOpen: requireOpen, - channelHashVerified: channelHashVerified, - startScanResult: startScanResult, - permissionResult: permissionResult, - openResult: openResult, - initResult: initResult, - channelHashVerifyResult: channelHashVerifyResult, - supportsETHResult: supportsETHResult, - supportsERC20Result: supportsERC20Result, - supportsLTCResult: supportsLTCResult, - channelHash: channelHash, - masterFingerprint: masterFingerprint, - btcXPub: btcXPub, - btcPsbt: btcPsbt, - btcMessageSignature: btcMessageSignature, - ethAddress: ethAddress, - ethTransactionSignature: ethTransactionSignature, - ethEip1559Signature: ethEip1559Signature, - ethRlpSignature: ethRlpSignature, - ethMessageSignature: ethMessageSignature, - ethTypedMessageSignature: ethTypedMessageSignature, - delays: delays, - errors: errors, - behaviors: behaviors, - ); - BitboxUsbPlatform.instance = platform; - return platform; - } - bool get isOpen => _isOpen; bool get channelHashVerified => _channelHashVerified; @@ -566,6 +506,12 @@ class SimulatedBitboxPlatform extends BitboxUsbPlatform { static Uint8List _copy(Uint8List bytes) => Uint8List.fromList(bytes); } +/// Constructs a [SimulatedBitboxPlatform] with the given overrides and +/// installs it as `BitboxUsbPlatform.instance`. Returns the platform so +/// tests can drive `setDelay` / `throwOn` / `when` and inspect `calls`. +/// +/// Save and restore `BitboxUsbPlatform.instance` in `setUp` / `tearDown` +/// when a suite needs isolation between tests. SimulatedBitboxPlatform installSimulatedBitboxPlatform({ List? devices, Duration defaultDelay = Duration.zero, @@ -593,32 +539,35 @@ SimulatedBitboxPlatform installSimulatedBitboxPlatform({ Map? delays, Map? errors, Map? behaviors, -}) => - SimulatedBitboxPlatform.install( - devices: devices, - defaultDelay: defaultDelay, - requireOpen: requireOpen, - channelHashVerified: channelHashVerified, - startScanResult: startScanResult, - permissionResult: permissionResult, - openResult: openResult, - initResult: initResult, - channelHashVerifyResult: channelHashVerifyResult, - supportsETHResult: supportsETHResult, - supportsERC20Result: supportsERC20Result, - supportsLTCResult: supportsLTCResult, - channelHash: channelHash, - masterFingerprint: masterFingerprint, - btcXPub: btcXPub, - btcPsbt: btcPsbt, - btcMessageSignature: btcMessageSignature, - ethAddress: ethAddress, - ethTransactionSignature: ethTransactionSignature, - ethEip1559Signature: ethEip1559Signature, - ethRlpSignature: ethRlpSignature, - ethMessageSignature: ethMessageSignature, - ethTypedMessageSignature: ethTypedMessageSignature, - delays: delays, - errors: errors, - behaviors: behaviors, - ); +}) { + final platform = SimulatedBitboxPlatform( + devices: devices, + defaultDelay: defaultDelay, + requireOpen: requireOpen, + channelHashVerified: channelHashVerified, + startScanResult: startScanResult, + permissionResult: permissionResult, + openResult: openResult, + initResult: initResult, + channelHashVerifyResult: channelHashVerifyResult, + supportsETHResult: supportsETHResult, + supportsERC20Result: supportsERC20Result, + supportsLTCResult: supportsLTCResult, + channelHash: channelHash, + masterFingerprint: masterFingerprint, + btcXPub: btcXPub, + btcPsbt: btcPsbt, + btcMessageSignature: btcMessageSignature, + ethAddress: ethAddress, + ethTransactionSignature: ethTransactionSignature, + ethEip1559Signature: ethEip1559Signature, + ethRlpSignature: ethRlpSignature, + ethMessageSignature: ethMessageSignature, + ethTypedMessageSignature: ethTypedMessageSignature, + delays: delays, + errors: errors, + behaviors: behaviors, + ); + BitboxUsbPlatform.instance = platform; + return platform; +}