Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified android/libs/api-sources.jar
Binary file not shown.
Binary file modified android/libs/api.aar
Binary file not shown.
10 changes: 5 additions & 5 deletions ios/Api.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@
<key>BinaryPath</key>
<string>Api.framework/Api</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>Api.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>Api.framework/Api</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>Api.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Binary file modified ios/Api.xcframework/ios-arm64/Api.framework/Api
Binary file not shown.
2 changes: 1 addition & 1 deletion ios/Api.xcframework/ios-arm64/Api.framework/Headers/Api.h
Original file line number Diff line number Diff line change
@@ -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__
Expand Down
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
4 changes: 2 additions & 2 deletions ios/Api.xcframework/ios-arm64/Api.framework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<key>MinimumOSVersion</key>
<string>100.0</string>
<key>CFBundleShortVersionString</key>
<string>0.0.1778239382</string>
<string>0.0.1779133764</string>
<key>CFBundleVersion</key>
<string>0.0.1778239382</string>
<string>0.0.1779133764</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
</dict>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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__
Expand Down
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<key>MinimumOSVersion</key>
<string>100.0</string>
<key>CFBundleShortVersionString</key>
<string>0.0.1778239382</string>
<string>0.0.1779133765</string>
<key>CFBundleVersion</key>
<string>0.0.1778239382</string>
<string>0.0.1779133765</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
</dict>
Expand Down
127 changes: 38 additions & 89 deletions lib/testing/bitbox_testkit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -180,66 +180,6 @@ class SimulatedBitboxPlatform extends BitboxUsbPlatform {
bool _isOpen = false;
bool _channelHashVerified;

static SimulatedBitboxPlatform install({
List<BitboxDevice>? 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<String, Duration>? delays,
Map<String, Object>? errors,
Map<String, SimulatedBitboxBehavior>? 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;
Expand Down Expand Up @@ -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<BitboxDevice>? devices,
Duration defaultDelay = Duration.zero,
Expand Down Expand Up @@ -593,32 +539,35 @@ SimulatedBitboxPlatform installSimulatedBitboxPlatform({
Map<String, Duration>? delays,
Map<String, Object>? errors,
Map<String, SimulatedBitboxBehavior>? 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;
}
Loading