Skip to content

Commit 9bd3042

Browse files
JeneaVranceanuJeneaVranceanu
authored
Merge pull request #773 from cclauss/swift-lint-cleanup-whitespace-changes
chore: swift lint cleanup -- whitespace-only changes from #756
2 parents cdf789b + ebc9f53 commit 9bd3042

20 files changed

+151
-152
lines changed

‎Sources/Web3Core/EthereumABI/ABIDecoding.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ extension ABIDecoder {
2121
var consumed: UInt64 = 0
2222
for i in 0 ..< types.count {
2323
let (v, c) = decodeSingleType(type: types[i], data: data, pointer: consumed)
24-
guard let valueUnwrapped = v, let consumedUnwrapped = c else {return nil}
24+
guard let valueUnwrapped = v, let consumedUnwrapped = c else { return nil }
2525
toReturn.append(valueUnwrapped)
2626
consumed = consumed + consumedUnwrapped
2727
}
28-
guard toReturn.count == types.count else {return nil}
28+
guard toReturn.count == types.count else { return nil }
2929
return toReturn
3030
}
3131

@@ -235,23 +235,23 @@ extension ABIDecoder {
235235
let nonIndexedTypes = nonIndexedInputs.compactMap { inp -> ABI.Element.ParameterType in
236236
return inp.type
237237
}
238-
guard logs.count == indexedInputs.count + 1 else {return nil}
238+
guard logs.count == indexedInputs.count + 1 else { return nil }
239239
var indexedValues = [Any]()
240240
for i in 0 ..< indexedInputs.count {
241241
let data = logs[i+1]
242242
let input = indexedInputs[i]
243243
if !input.type.isStatic || input.type.isArray || input.type.memoryUsage != 32 {
244244
let (v, _) = ABIDecoder.decodeSingleType(type: .bytes(length: 32), data: data)
245-
guard let valueUnwrapped = v else {return nil}
245+
guard let valueUnwrapped = v else { return nil }
246246
indexedValues.append(valueUnwrapped)
247247
} else {
248248
let (v, _) = ABIDecoder.decodeSingleType(type: input.type, data: data)
249-
guard let valueUnwrapped = v else {return nil}
249+
guard let valueUnwrapped = v else { return nil }
250250
indexedValues.append(valueUnwrapped)
251251
}
252252
}
253253
let v = ABIDecoder.decode(types: nonIndexedTypes, data: dataForProcessing)
254-
guard let nonIndexedValues = v else {return nil}
254+
guard let nonIndexedValues = v else { return nil }
255255
var indexedInputCounter = 0
256256
var nonIndexedInputCounter = 0
257257
for i in 0 ..< event.inputs.count {

‎Sources/Web3Core/EthereumABI/ABIEncoding.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public struct ABIEncoder {
119119
case let d as [IntegerLiteralType]:
120120
var bytesArray = [UInt8]()
121121
for el in d {
122-
guard el >= 0, el <= 255 else {return nil}
122+
guard el >= 0, el <= 255 else { return nil }
123123
bytesArray.append(UInt8(el))
124124
}
125125
return Data(bytesArray)
@@ -140,7 +140,7 @@ public struct ABIEncoder {
140140
/// - `types.count != values.count`;
141141
/// - encoding of at least one value has failed (e.g. type mismatch).
142142
public static func encode(types: [ABI.Element.InOut], values: [Any]) -> Data? {
143-
guard types.count == values.count else {return nil}
143+
guard types.count == values.count else { return nil }
144144
let params = types.compactMap { el -> ABI.Element.ParameterType in
145145
return el.type
146146
}
@@ -156,12 +156,12 @@ public struct ABIEncoder {
156156
/// - `types.count != values.count`;
157157
/// - encoding of at least one value has failed (e.g. type mismatch).
158158
public static func encode(types: [ABI.Element.ParameterType], values: [Any]) -> Data? {
159-
guard types.count == values.count else {return nil}
159+
guard types.count == values.count else { return nil }
160160
var tails = [Data]()
161161
var heads = [Data]()
162162
for i in 0 ..< types.count {
163163
let enc = encodeSingleType(type: types[i], value: values[i])
164-
guard let encoding = enc else {return nil}
164+
guard let encoding = enc else { return nil }
165165
if types[i].isStatic {
166166
heads.append(encoding)
167167
tails.append(Data())
@@ -181,7 +181,7 @@ public struct ABIEncoder {
181181
let head = heads[i]
182182
let tail = tails[i]
183183
if !types[i].isStatic {
184-
guard let newHead = tailsPointer.abiEncode(bits: 256) else {return nil}
184+
guard let newHead = tailsPointer.abiEncode(bits: 256) else { return nil }
185185
headsConcatenated.append(newHead)
186186
tailsConcatenated.append(tail)
187187
tailsPointer = tailsPointer + BigUInt(tail.count)
@@ -227,7 +227,7 @@ public struct ABIEncoder {
227227
return bigint == nil ? nil : bigint!.abiEncode(bits: 256)
228228
case .address:
229229
if let string = value as? String {
230-
guard let address = EthereumAddress(string) else {return nil}
230+
guard let address = EthereumAddress(string) else { return nil }
231231
let data = address.addressData
232232
return data.setLengthLeft(32)
233233
} else if let address = value as? EthereumAddress {
@@ -295,7 +295,7 @@ public struct ABIEncoder {
295295
var heads = [Data]()
296296
for i in 0 ..< val.count {
297297
let enc = encodeSingleType(type: subType, value: val[i])
298-
guard let encoding = enc else {return nil}
298+
guard let encoding = enc else { return nil }
299299
heads.append(Data(repeating: 0x0, count: 32))
300300
tails.append(encoding)
301301
}
@@ -310,7 +310,7 @@ public struct ABIEncoder {
310310
let head = heads[i]
311311
let tail = tails[i]
312312
if tail != Data() {
313-
guard let newHead = tailsPointer.abiEncode(bits: 256) else {return nil}
313+
guard let newHead = tailsPointer.abiEncode(bits: 256) else { return nil }
314314
headsConcatenated.append(newHead)
315315
tailsConcatenated.append(tail)
316316
tailsPointer = tailsPointer + BigUInt(tail.count)
@@ -342,7 +342,7 @@ public struct ABIEncoder {
342342
var heads = [Data]()
343343
for i in 0 ..< val.count {
344344
let enc = encodeSingleType(type: subType, value: val[i])
345-
guard let encoding = enc else {return nil}
345+
guard let encoding = enc else { return nil }
346346
heads.append(Data(repeating: 0x0, count: 32))
347347
tails.append(encoding)
348348
}
@@ -355,7 +355,7 @@ public struct ABIEncoder {
355355
var tailsConcatenated = Data()
356356
for i in 0 ..< val.count {
357357
let tail = tails[i]
358-
guard let newHead = tailsPointer.abiEncode(bits: 256) else {return nil}
358+
guard let newHead = tailsPointer.abiEncode(bits: 256) else { return nil }
359359
headsConcatenated.append(newHead)
360360
tailsConcatenated.append(tail)
361361
tailsPointer = tailsPointer + BigUInt(tail.count)
@@ -372,7 +372,7 @@ public struct ABIEncoder {
372372
guard let val = value as? [Any] else {break}
373373
for i in 0 ..< subTypes.count {
374374
let enc = encodeSingleType(type: subTypes[i], value: val[i])
375-
guard let encoding = enc else {return nil}
375+
guard let encoding = enc else { return nil }
376376
if subTypes[i].isStatic {
377377
heads.append(encoding)
378378
tails.append(Data())
@@ -392,7 +392,7 @@ public struct ABIEncoder {
392392
let head = heads[i]
393393
let tail = tails[i]
394394
if !subTypes[i].isStatic {
395-
guard let newHead = tailsPointer.abiEncode(bits: 256) else {return nil}
395+
guard let newHead = tailsPointer.abiEncode(bits: 256) else { return nil }
396396
headsConcatenated.append(newHead)
397397
tailsConcatenated.append(tail)
398398
tailsPointer = tailsPointer + BigUInt(tail.count)

‎Sources/Web3Core/EthereumAddress/EthereumAddress.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ public struct EthereumAddress: Equatable {
6363
/// represented as `ASCII` data. Otherwise, checksummed address is returned with `0x` prefix.
6464
public static func toChecksumAddress(_ addr: String) -> String? {
6565
let address = addr.lowercased().stripHexPrefix()
66-
guard let hash = address.data(using: .ascii)?.sha3(.keccak256).toHexString().stripHexPrefix() else {return nil}
66+
guard let hash = address.data(using: .ascii)?.sha3(.keccak256).toHexString().stripHexPrefix() else { return nil }
6767
var ret = "0x"
6868

6969
for (i, char) in address.enumerated() {
7070
let startIdx = hash.index(hash.startIndex, offsetBy: i)
7171
let endIdx = hash.index(hash.startIndex, offsetBy: i+1)
7272
let hashChar = String(hash[startIdx..<endIdx])
7373
let c = String(char)
74-
guard let int = Int(hashChar, radix: 16) else {return nil}
74+
guard let int = Int(hashChar, radix: 16) else { return nil }
7575
if int >= 8 {
7676
ret += c.uppercased()
7777
} else {
@@ -96,8 +96,8 @@ extension EthereumAddress {
9696
public init?(_ addressString: String, type: AddressType = .normal, ignoreChecksum: Bool = false) {
9797
switch type {
9898
case .normal:
99-
guard let data = Data.fromHex(addressString) else {return nil}
100-
guard data.count == 20 else {return nil}
99+
guard let data = Data.fromHex(addressString) else { return nil }
100+
guard data.count == 20 else { return nil }
101101
if !addressString.hasHexPrefix() {
102102
return nil
103103
}
@@ -113,7 +113,7 @@ extension EthereumAddress {
113113
return
114114
} else {
115115
let checksummedAddress = EthereumAddress.toChecksumAddress(data.toHexString().addHexPrefix())
116-
guard checksummedAddress == addressString else {return nil}
116+
guard checksummedAddress == addressString else { return nil }
117117
self._address = data.toHexString().addHexPrefix()
118118
self.type = .normal
119119
return
@@ -131,7 +131,7 @@ extension EthereumAddress {
131131
}
132132

133133
public init?(_ addressData: Data, type: AddressType = .normal) {
134-
guard addressData.count == 20 else {return nil}
134+
guard addressData.count == 20 else { return nil }
135135
self._address = addressData.toHexString().addHexPrefix()
136136
self.type = type
137137
}

‎Sources/Web3Core/KeystoreManager/BIP32HDNode.swift

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public class HDNode {
6969
}
7070

7171
public init?(_ data: Data) {
72-
guard data.count == 82 else {return nil}
72+
guard data.count == 82 else { return nil }
7373
let header = data[0..<4]
7474
var serializePrivate = false
7575
if header == HDNode.HDversion().privatePrefix {
@@ -81,30 +81,30 @@ public class HDNode {
8181
chaincode = data[13..<45]
8282
if serializePrivate {
8383
privateKey = data[46..<78]
84-
guard let pubKey = Utilities.privateToPublic(privateKey!, compressed: true) else {return nil}
85-
if pubKey[0] != 0x02 && pubKey[0] != 0x03 {return nil}
84+
guard let pubKey = Utilities.privateToPublic(privateKey!, compressed: true) else { return nil }
85+
if pubKey[0] != 0x02 && pubKey[0] != 0x03 { return nil }
8686
publicKey = pubKey
8787
} else {
8888
publicKey = data[45..<78]
8989
}
9090
let hashedData = data[0..<78].sha256().sha256()
9191
let checksum = hashedData[0..<4]
92-
if checksum != data[78..<82] {return nil}
92+
if checksum != data[78..<82] { return nil }
9393
}
9494

9595
public init?(seed: Data) {
96-
guard seed.count >= 16 else {return nil}
96+
guard seed.count >= 16 else { return nil }
9797
let hmacKey = "Bitcoin seed".data(using: .ascii)!
9898
let hmac: Authenticator = HMAC(key: hmacKey.bytes, variant: HMAC.Variant.sha2(.sha512))
99-
guard let entropy = try? hmac.authenticate(seed.bytes) else {return nil}
99+
guard let entropy = try? hmac.authenticate(seed.bytes) else { return nil }
100100
guard entropy.count == 64 else { return nil}
101101
let I_L = entropy[0..<32]
102102
let I_R = entropy[32..<64]
103103
chaincode = Data(I_R)
104104
let privKeyCandidate = Data(I_L)
105-
guard SECP256K1.verifyPrivateKey(privateKey: privKeyCandidate) else {return nil}
106-
guard let pubKeyCandidate = SECP256K1.privateToPublic(privateKey: privKeyCandidate, compressed: true) else {return nil}
107-
guard pubKeyCandidate.bytes[0] == 0x02 || pubKeyCandidate.bytes[0] == 0x03 else {return nil}
105+
guard SECP256K1.verifyPrivateKey(privateKey: privKeyCandidate) else { return nil }
106+
guard let pubKeyCandidate = SECP256K1.privateToPublic(privateKey: privKeyCandidate, compressed: true) else { return nil }
107+
guard pubKeyCandidate.bytes[0] == 0x02 || pubKeyCandidate.bytes[0] == 0x03 else { return nil }
108108
publicKey = pubKeyCandidate
109109
privateKey = privKeyCandidate
110110
depth = 0x00
@@ -135,7 +135,7 @@ extension HDNode {
135135
inputForHMAC.append(Data([UInt8(0x00)]))
136136
inputForHMAC.append(self.privateKey!)
137137
inputForHMAC.append(trueIndex.serialize32())
138-
guard let ent = try? hmac.authenticate(inputForHMAC.bytes) else {return nil }
138+
guard let ent = try? hmac.authenticate(inputForHMAC.bytes) else { return nil }
139139
guard ent.count == 64 else { return nil }
140140
entropy = ent
141141
} else {
@@ -144,7 +144,7 @@ extension HDNode {
144144
var inputForHMAC = Data()
145145
inputForHMAC.append(self.publicKey)
146146
inputForHMAC.append(trueIndex.serialize32())
147-
guard let ent = try? hmac.authenticate(inputForHMAC.bytes) else {return nil }
147+
guard let ent = try? hmac.authenticate(inputForHMAC.bytes) else { return nil }
148148
guard ent.count == 64 else { return nil }
149149
entropy = ent
150150
}
@@ -165,11 +165,11 @@ extension HDNode {
165165
}
166166
return nil
167167
}
168-
guard let privKeyCandidate = newPK.serialize().setLengthLeft(32) else {return nil}
169-
guard SECP256K1.verifyPrivateKey(privateKey: privKeyCandidate) else {return nil }
170-
guard let pubKeyCandidate = SECP256K1.privateToPublic(privateKey: privKeyCandidate, compressed: true) else {return nil}
171-
guard pubKeyCandidate.bytes[0] == 0x02 || pubKeyCandidate.bytes[0] == 0x03 else {return nil}
172-
guard self.depth < UInt8.max else {return nil}
168+
guard let privKeyCandidate = newPK.serialize().setLengthLeft(32) else { return nil }
169+
guard SECP256K1.verifyPrivateKey(privateKey: privKeyCandidate) else { return nil }
170+
guard let pubKeyCandidate = SECP256K1.privateToPublic(privateKey: privKeyCandidate, compressed: true) else { return nil }
171+
guard pubKeyCandidate.bytes[0] == 0x02 || pubKeyCandidate.bytes[0] == 0x03 else { return nil }
172+
guard self.depth < UInt8.max else { return nil }
173173
let newNode = HDNode()
174174
newNode.chaincode = cc
175175
newNode.depth = self.depth + 1
@@ -201,7 +201,7 @@ extension HDNode {
201201
var inputForHMAC = Data()
202202
inputForHMAC.append(self.publicKey)
203203
inputForHMAC.append(index.serialize32())
204-
guard let ent = try? hmac.authenticate(inputForHMAC.bytes) else {return nil }
204+
guard let ent = try? hmac.authenticate(inputForHMAC.bytes) else { return nil }
205205
guard ent.count == 64 else { return nil }
206206
entropy = ent
207207
}
@@ -215,13 +215,13 @@ extension HDNode {
215215
}
216216
return nil
217217
}
218-
guard let tempKey = bn.serialize().setLengthLeft(32) else {return nil}
219-
guard SECP256K1.verifyPrivateKey(privateKey: tempKey) else {return nil }
220-
guard let pubKeyCandidate = SECP256K1.privateToPublic(privateKey: tempKey, compressed: true) else {return nil}
221-
guard pubKeyCandidate.bytes[0] == 0x02 || pubKeyCandidate.bytes[0] == 0x03 else {return nil}
222-
guard let newPublicKey = SECP256K1.combineSerializedPublicKeys(keys: [self.publicKey, pubKeyCandidate], outputCompressed: true) else {return nil}
223-
guard newPublicKey.bytes[0] == 0x02 || newPublicKey.bytes[0] == 0x03 else {return nil}
224-
guard self.depth < UInt8.max else {return nil}
218+
guard let tempKey = bn.serialize().setLengthLeft(32) else { return nil }
219+
guard SECP256K1.verifyPrivateKey(privateKey: tempKey) else { return nil }
220+
guard let pubKeyCandidate = SECP256K1.privateToPublic(privateKey: tempKey, compressed: true) else { return nil }
221+
guard pubKeyCandidate.bytes[0] == 0x02 || pubKeyCandidate.bytes[0] == 0x03 else { return nil }
222+
guard let newPublicKey = SECP256K1.combineSerializedPublicKeys(keys: [self.publicKey, pubKeyCandidate], outputCompressed: true) else { return nil }
223+
guard newPublicKey.bytes[0] == 0x02 || newPublicKey.bytes[0] == 0x03 else { return nil }
224+
guard self.depth < UInt8.max else { return nil }
225225
let newNode = HDNode()
226226
newNode.chaincode = cc
227227
newNode.depth = self.depth + 1
@@ -255,22 +255,22 @@ extension HDNode {
255255
if component.hasSuffix("'") {
256256
hardened = true
257257
}
258-
guard let index = UInt32(component.trimmingCharacters(in: CharacterSet(charactersIn: "'"))) else {return nil}
259-
guard let newNode = currentNode.derive(index: index, derivePrivateKey: derivePrivateKey, hardened: hardened) else {return nil}
258+
guard let index = UInt32(component.trimmingCharacters(in: CharacterSet(charactersIn: "'"))) else { return nil }
259+
guard let newNode = currentNode.derive(index: index, derivePrivateKey: derivePrivateKey, hardened: hardened) else { return nil }
260260
currentNode = newNode
261261
}
262262
return currentNode
263263
}
264264

265265
public func serializeToString(serializePublic: Bool = true, version: HDversion = HDversion()) -> String? {
266-
guard let data = self.serialize(serializePublic: serializePublic, version: version) else {return nil}
266+
guard let data = self.serialize(serializePublic: serializePublic, version: version) else { return nil }
267267
let encoded = Base58.base58FromBytes(data.bytes)
268268
return encoded
269269
}
270270

271271
public func serialize(serializePublic: Bool = true, version: HDversion = HDversion()) -> Data? {
272272
var data = Data()
273-
if !serializePublic && !self.hasPrivate {return nil}
273+
if !serializePublic && !self.hasPrivate { return nil }
274274
if serializePublic {
275275
data.append(version.publicPrefix)
276276
} else {

0 commit comments

Comments
 (0)