Skip to content
Open
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
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ opt-level = 3
[profile.dev-ios]
inherits = "dev"
panic = "abort"
lto = "thin"

# Optimize heavy crypto crates even in dev/test builds so that
# Halo 2 proof generation and verification run at near-release speed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -628,18 +628,19 @@ struct CreateIdentityView: View {
} header: {
Text("Funding Source")
} footer: {
Text(
"Any account on the selected wallet with a balance can fund "
+ "the identity — Core or Platform Payment. Empty accounts "
+ "are hidden. "
+ (showShielded
? "Shielded Balance funds the identity directly from this "
+ "wallet's shielded (Orchard) pool by spending a fixed "
+ "denomination. "
: "")
+ "To resume a prior in-flight registration, "
+ "use the Resumable Registrations section on the Identities tab."
)
let shieldedNote = showShielded
? "Shielded Balance funds the identity directly from this "
+ "wallet's shielded (Orchard) pool by spending a fixed "
+ "denomination. "
: ""
Text([
"Any account on the selected wallet with a balance can fund ",
"the identity — Core or Platform Payment. Empty accounts ",
"are hidden. ",
shieldedNote,
"To resume a prior in-flight registration, ",
"use the Resumable Registrations section on the Identities tab.",
].joined())
}
}

Expand Down
1 change: 1 addition & 0 deletions packages/swift-sdk/build_ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ while [[ $# -gt 0 ]]; do
sim) BUILD_SIM=true ;;
mac) BUILD_MAC=true ;;
all) BUILD_IOS=true; BUILD_SIM=true; BUILD_MAC=true ;;
tests) BUILD_SIM=true; BUILD_MAC=true ;;
Comment thread
ZocoLini marked this conversation as resolved.
*) log_error "Unknown target $2"; show_help ;;
esac
shift 2
Expand Down
26 changes: 1 addition & 25 deletions packages/swift-sdk/run_tests.sh
Original file line number Diff line number Diff line change
@@ -1,33 +1,9 @@
#!/bin/bash
set -euo pipefail

# This script builds the sdk using `build_ios.sh` for all targets,
# then runs the DashSDKFFI tests, and finally runs the
# ExampleApp tests on a selected iOS Simulator

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "$SCRIPT_DIR" || exit 1

# Pick a concrete iOS Simulator for the `xcodebuild test` run. A name
# can be pinned via `SIM_NAME`; otherwise grab the first available
SIM_NAME="${SIM_NAME:-}"
if [ -z "$SIM_NAME" ]; then
SIM_NAME="$(xcrun simctl list devices available \
| grep -oE 'iPhone [0-9][^(]*' | head -1 | sed 's/ *$//')"
fi
if [ -z "$SIM_NAME" ]; then
echo "No available iPhone simulator found for the simulator test run" >&2
exit 1
fi

bash build_ios.sh --target all --profile dev
bash build_ios.sh --target tests --profile dev
Comment thread
ZocoLini marked this conversation as resolved.

swift package clean
swift build
swift test
Comment thread
ZocoLini marked this conversation as resolved.

xcodebuild test \
-project SwiftExampleApp/SwiftExampleApp.xcodeproj \
-scheme SwiftExampleApp \
-skip-testing:SwiftExampleAppUITests \
-destination "platform=iOS Simulator,name=$SIM_NAME"
Loading