Skip to content

Commit 208ebdc

Browse files
chore: renamed parsedFields into capturedFields
1 parent 391b5b8 commit 208ebdc

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Sources/web3swift/Utils/EIP/EIP4361.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@ public final class EIP4361 {
8484
public static func validate(_ message: String) -> EIP4361ValidationResponse {
8585
let siweConstantMessageRegex = try! NSRegularExpression(pattern: "^\(domain)")
8686
guard siweConstantMessageRegex.firstMatch(in: message, range: message.fullNSRange) != nil else {
87-
return EIP4361ValidationResponse(isEIP4361: false, eip4361: nil, parsedFields: [:])
87+
return EIP4361ValidationResponse(isEIP4361: false, eip4361: nil, capturedFields: [:])
8888
}
8989

9090
let eip4361Regex = try! NSRegularExpression(pattern: eip4361OptionalPattern)
91-
var parsedFields: [EIP4361Field: String] = [:]
91+
var capturedFields: [EIP4361Field: String] = [:]
9292
for (key, value) in eip4361Regex.captureGroups(string: message) {
93-
parsedFields[.init(rawValue: key)!] = value
93+
capturedFields[.init(rawValue: key)!] = value
9494
}
9595
return EIP4361ValidationResponse(isEIP4361: true,
9696
eip4361: EIP4361(message),
97-
parsedFields: parsedFields)
97+
capturedFields: capturedFields)
9898
}
9999

100100
/// `domain` is the RFC 3986 authority that is requesting the signing.
@@ -200,7 +200,7 @@ public final class EIP4361 {
200200
public struct EIP4361ValidationResponse {
201201
public let isEIP4361: Bool
202202
public let eip4361: EIP4361?
203-
public let parsedFields: [EIP4361.EIP4361Field: String]
203+
public let capturedFields: [EIP4361.EIP4361Field: String]
204204

205205
public var isValid: Bool {
206206
eip4361 != nil

Tests/web3swiftTests/localTests/EIP4361Test.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ class EIP4361Test: XCTestCase {
7878
}
7979

8080
XCTAssertNotNil(validationResponse.eip4361)
81-
XCTAssertNil(validationResponse.parsedFields[.expirationTime])
82-
XCTAssertNil(validationResponse.parsedFields[.notBefore])
83-
XCTAssertNil(validationResponse.parsedFields[.requestId])
84-
XCTAssertNil(validationResponse.parsedFields[.resources])
81+
XCTAssertNil(validationResponse.capturedFields[.expirationTime])
82+
XCTAssertNil(validationResponse.capturedFields[.notBefore])
83+
XCTAssertNil(validationResponse.capturedFields[.requestId])
84+
XCTAssertNil(validationResponse.capturedFields[.resources])
8585
}
8686

8787
func test_invalidEIP4361_missingAddress() {
@@ -93,7 +93,7 @@ class EIP4361Test: XCTestCase {
9393
return
9494
}
9595

96-
XCTAssertNil(validationResponse.parsedFields[.address])
96+
XCTAssertNil(validationResponse.capturedFields[.address])
9797
}
9898

9999
func test_invalidEIP4361_missingUri() {
@@ -105,7 +105,7 @@ class EIP4361Test: XCTestCase {
105105
return
106106
}
107107

108-
XCTAssertNil(validationResponse.parsedFields[.uri])
108+
XCTAssertNil(validationResponse.capturedFields[.uri])
109109
}
110110

111111
func test_invalidEIP4361_missingVersion() {
@@ -117,7 +117,7 @@ class EIP4361Test: XCTestCase {
117117
return
118118
}
119119

120-
XCTAssertNil(validationResponse.parsedFields[.version])
120+
XCTAssertNil(validationResponse.capturedFields[.version])
121121
}
122122

123123
func test_invalidEIP4361_missingChainId() {
@@ -129,7 +129,7 @@ class EIP4361Test: XCTestCase {
129129
return
130130
}
131131

132-
XCTAssertNil(validationResponse.parsedFields[.chainId])
132+
XCTAssertNil(validationResponse.capturedFields[.chainId])
133133
}
134134

135135
func test_invalidEIP4361_missingNonce() {
@@ -141,7 +141,7 @@ class EIP4361Test: XCTestCase {
141141
return
142142
}
143143

144-
XCTAssertNil(validationResponse.parsedFields[.nonce])
144+
XCTAssertNil(validationResponse.capturedFields[.nonce])
145145
}
146146

147147
func test_invalidEIP4361_missingIssuedAt() {
@@ -153,7 +153,7 @@ class EIP4361Test: XCTestCase {
153153
return
154154
}
155155

156-
XCTAssertNil(validationResponse.parsedFields[.issuedAt])
156+
XCTAssertNil(validationResponse.capturedFields[.issuedAt])
157157
}
158158

159159
func test_invalidEIP4361_wrongVersionNumber() {
@@ -165,6 +165,6 @@ class EIP4361Test: XCTestCase {
165165
return
166166
}
167167

168-
XCTAssertEqual(validationResponse.parsedFields[.version], "123")
168+
XCTAssertEqual(validationResponse.capturedFields[.version], "123")
169169
}
170170
}

0 commit comments

Comments
 (0)