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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ jobs:
- name: Run tests with coverage
run: pnpm vitest run --coverage --config vitest.config.ci.ts
env:
SURFPOOL_REPORT: "1"
# Reliable RPC datasource for the embedded surfnet (see the Rust job).
SURFPOOL_DATASOURCE_RPC_URL: ${{ secrets.SURFPOOL_DATASOURCE_RPC_URL }}

Expand Down Expand Up @@ -176,7 +175,6 @@ jobs:
- name: Run tests with coverage
working-directory: rust
env:
SURFPOOL_REPORT: "1"
# Reliable RPC datasource for the embedded surfnet — without it the
# surfpool integration tests clone from the public mainnet-beta RPC,
# which rate-limits and crashes surfnet mid-test in CI.
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ jobs:
- name: Typecheck harness
working-directory: harness
run: pnpm typecheck
- name: Run Swift cross-SDK conformance vectors
working-directory: harness
env:
MPP_CONFORMANCE_LANGUAGES: swift
run: pnpm exec vitest run test/conformance.test.ts
- name: Run Swift client harness smoke against TypeScript server
working-directory: harness
env:
Expand Down
3 changes: 2 additions & 1 deletion harness/runners/swift.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"language": "swift",
"command": ["swift", "run", "-c", "release", "mpp-conformance"],
"cwd": "swift"
"cwd": "swift",
"intents": ["charge", "x402-exact", "session"]
}
9 changes: 7 additions & 2 deletions rust/crates/mpp/tests/charge_integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@ use tokio::time::{sleep, Duration};
const SURFPOOL_DATASOURCE_RPC_URL_ENV: &str = "SURFPOOL_DATASOURCE_RPC_URL";

async fn start_surfnet() -> Option<Surfnet> {
let datasource_rpc_url = std::env::var(SURFPOOL_DATASOURCE_RPC_URL_ENV)
.unwrap_or_else(|_| "https://api.mainnet-beta.solana.com".to_string());
let datasource_rpc_url = match std::env::var(SURFPOOL_DATASOURCE_RPC_URL_ENV) {
Ok(value) if !value.trim().is_empty() => value,
_ => {
eprintln!("skipping surfpool test: {SURFPOOL_DATASOURCE_RPC_URL_ENV} is not set");
return None;
}
};

match Surfnet::builder()
.remote_rpc_url(datasource_rpc_url)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
A1000010000000000000A001 /* PayKitDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1000020000000000000A001 /* PayKitDemoApp.swift */; };
A1000010000000000000A002 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1000020000000000000A002 /* ContentView.swift */; };
A1000010000000000000A003 /* DemoSigner.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1000020000000000000A003 /* DemoSigner.swift */; };
A1000010000000000000A005 /* OpenAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1000020000000000000A005 /* OpenAPI.swift */; };
A1000011000000000000A006 /* SessionStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1000021000000000000A006 /* SessionStream.swift */; };
A1000010000000000000A004 /* SolanaPayKit in Frameworks */ = {isa = PBXBuildFile; productRef = A1000050000000000000A001 /* SolanaPayKit */; };
/* End PBXBuildFile section */

Expand All @@ -18,6 +20,8 @@
A1000020000000000000A001 /* PayKitDemoApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PayKitDemoApp.swift; sourceTree = "<group>"; };
A1000020000000000000A002 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
A1000020000000000000A003 /* DemoSigner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoSigner.swift; sourceTree = "<group>"; };
A1000020000000000000A005 /* OpenAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenAPI.swift; sourceTree = "<group>"; };
A1000021000000000000A006 /* SessionStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionStream.swift; sourceTree = "<group>"; };
A1000020000000000000A004 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A1000020000000000000A010 /* SolanaPayKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = SolanaPayKit; path = ../../; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -49,6 +53,8 @@
A1000020000000000000A001 /* PayKitDemoApp.swift */,
A1000020000000000000A002 /* ContentView.swift */,
A1000020000000000000A003 /* DemoSigner.swift */,
A1000020000000000000A005 /* OpenAPI.swift */,
A1000021000000000000A006 /* SessionStream.swift */,
A1000020000000000000A004 /* Info.plist */,
);
path = PayKitDemo;
Expand Down Expand Up @@ -147,6 +153,8 @@
A1000010000000000000A001 /* PayKitDemoApp.swift in Sources */,
A1000010000000000000A002 /* ContentView.swift in Sources */,
A1000010000000000000A003 /* DemoSigner.swift in Sources */,
A1000010000000000000A005 /* OpenAPI.swift in Sources */,
A1000011000000000000A006 /* SessionStream.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Loading
Loading