Merge branch 'develop' of github.com:WalletConnect/WalletConnectSwift…

…V2 into auth-respond-service-#377- # Conflicts: # Sources/Auth/Services/Wallet/AuthRequestSubscriber.swift # Tests/AuthTests/Stubs/RequestSubscriptionPayload.swift
WalletConnect · Aug 5, 2022 · 4157195 · 4157195
2 parents 39238f0 + eb80d6e
commit 4157195
Show file tree

Hide file tree

Showing 18 changed files with 205 additions and 148 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,33 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        test-type: [ui-tests, unit-tests, integration-tests, build-example-wallet, build-example-dapp]
+        test-type: [unit-tests, integration-tests, build-example-wallet, build-example-dapp]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup Xcode Version
+      uses: maxim-lobanov/setup-xcode@v1
+
+    - uses: actions/cache@v2
+      with:
+        path: |
+          .build
+          SourcePackages
+        key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+        restore-keys: |
+          ${{ runner.os }}-spm-
+
+    - uses: ./.github/actions/ci
+      with:
+        type: ${{ matrix.test-type }}
+
+  test-ui:
+    if: github.ref == 'refs/heads/main'
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        test-type: [ui-tests]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/Example/ExampleApp.xcodeproj/project.pbxproj b/Example/ExampleApp.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
 		765056272821989600F9AE79 /* Color+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 765056262821989600F9AE79 /* Color+Extension.swift */; };
 		76744CF726FE4D5400B77ED9 /* ActiveSessionItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76744CF626FE4D5400B77ED9 /* ActiveSessionItem.swift */; };
 		76744CF926FE4D7400B77ED9 /* ActiveSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76744CF826FE4D7400B77ED9 /* ActiveSessionCell.swift */; };
+		767DC83528997F8E00080FA9 /* EthSendTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 767DC83428997F8E00080FA9 /* EthSendTransaction.swift */; };
 		7694A5262874296A0001257E /* RegistryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7694A5252874296A0001257E /* RegistryTests.swift */; };
 		76B149F02821C03B00F05F91 /* Proposal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76B149EF2821C03B00F05F91 /* Proposal.swift */; };
 		76B6E39F2807A3B6004DF775 /* WalletViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76B6E39E2807A3B6004DF775 /* WalletViewController.swift */; };
@@ -182,6 +183,7 @@
 		765056262821989600F9AE79 /* Color+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extension.swift"; sourceTree = "<group>"; };
 		76744CF626FE4D5400B77ED9 /* ActiveSessionItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveSessionItem.swift; sourceTree = "<group>"; };
 		76744CF826FE4D7400B77ED9 /* ActiveSessionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveSessionCell.swift; sourceTree = "<group>"; };
+		767DC83428997F8E00080FA9 /* EthSendTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthSendTransaction.swift; sourceTree = "<group>"; };
 		7694A5252874296A0001257E /* RegistryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistryTests.swift; sourceTree = "<group>"; };
 		76B149EF2821C03B00F05F91 /* Proposal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Proposal.swift; sourceTree = "<group>"; };
 		76B6E39E2807A3B6004DF775 /* WalletViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WalletViewController.swift; sourceTree = "<group>"; };
@@ -436,6 +438,15 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		767DC83328997F7600080FA9 /* Helpers */ = {
+			isa = PBXGroup;
+			children = (
+				A5E03DF8286465C700888481 /* ClientDelegate.swift */,
+				767DC83428997F8E00080FA9 /* EthSendTransaction.swift */,
+			);
+			path = Helpers;
+			sourceTree = "<group>";
+		};
 		8460DCFD274F98A90081F94C /* Request */ = {
 			isa = PBXGroup;
 			children = (
@@ -862,7 +873,7 @@
 		A5E03E0928646A8100888481 /* Sign */ = {
 			isa = PBXGroup;
 			children = (
-				A5E03DF8286465C700888481 /* ClientDelegate.swift */,
+				767DC83328997F7600080FA9 /* Helpers */,
 				A5E03DF9286465C700888481 /* SignClientTests.swift */,
 			);
 			path = Sign;
@@ -1248,6 +1259,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				767DC83528997F8E00080FA9 /* EthSendTransaction.swift in Sources */,
 				A5E03DFB286465C700888481 /* ClientDelegate.swift in Sources */,
 				A5E03E03286466F400888481 /* ChatTests.swift in Sources */,
 				7694A5262874296A0001257E /* RegistryTests.swift in Sources */,

diff --git a/...ntegrationTests/Sign/ClientDelegate.swift → ...onTests/Sign/Helpers/ClientDelegate.swift b/...ntegrationTests/Sign/ClientDelegate.swift → ...onTests/Sign/Helpers/ClientDelegate.swift
diff --git a/Example/IntegrationTests/Sign/Helpers/EthSendTransaction.swift b/Example/IntegrationTests/Sign/Helpers/EthSendTransaction.swift
@@ -0,0 +1,26 @@
+import Foundation
+
+struct EthSendTransaction: Codable, Equatable {
+    let from: String
+    let data: String
+    let value: String
+    let to: String
+    let gasPrice: String
+    let nonce: String
+
+    static func stub() -> EthSendTransaction {
+        try! JSONDecoder().decode(EthSendTransaction.self, from: ethSendTransactionJSON.data(using: .utf8)!)
+    }
+
+    private static let ethSendTransactionJSON = """
+{
+    "from":"0xb60e8dd61c5d32be8058bb8eb970870f07233155",
+    "to":"0xd46e8dd67c5d32be8058bb8eb970870f07244567",
+    "data":"0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675",
+    "gas":"0x76c0",
+    "gasPrice":"0x9184e72a000",
+    "value":"0x9184e72a",
+    "nonce":"0x117"
+}
+"""
+}