Skip to content

Commit 959e0da

Browse files
shamatarshamatar
committed
Merge commit '71f54d044bd29499fff2a92ee902d50ac4866e1f' into develop
2 parents 19f108a + 71f54d0 commit 959e0da

24 files changed

+139
-113
lines changed

‎web3swift/ABIv2/Classes/ABIv2TypeParser.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public struct ABIv2TypeParser {
4949

5050
public static func parseTypeString(_ string:String) throws -> ABIv2.Element.ParameterType {
5151
let (type, tail) = recursiveParseType(string)
52-
guard let t = type, tail == nil else {throw Web3Error.inputError("Failed to parse ABI element " + string)}
52+
guard let t = type, tail == nil else {throw Web3Error.inputError(desc: "Failed to parse ABI element " + string)}
5353
return t
5454
}
5555

‎web3swift/HookedFunctions/Classes/Web3+Wallet.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ extension web3.Web3Wallet {
4444
return Result(true)
4545
} catch {
4646
if error is AbstractKeystoreError {
47-
return Result.failure(Web3Error.keystoreError(error as! AbstractKeystoreError))
47+
return Result.failure(Web3Error.keystoreError(err: error as! AbstractKeystoreError))
4848
}
49-
return Result.failure(Web3Error.generalError(error))
49+
return Result.failure(Web3Error.generalError(err: error))
5050
}
5151
}
5252

@@ -71,9 +71,9 @@ extension web3.Web3Wallet {
7171
}
7272
catch{
7373
if error is AbstractKeystoreError {
74-
return Result.failure(Web3Error.keystoreError(error as! AbstractKeystoreError))
74+
return Result.failure(Web3Error.keystoreError(err: error as! AbstractKeystoreError))
7575
}
76-
return Result.failure(Web3Error.generalError(error))
76+
return Result.failure(Web3Error.generalError(err: error))
7777
}
7878
}
7979

‎web3swift/ObjectiveCbridge/Classes/Web3+Eth+ObjC.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ public final class _ObjCweb3Eth: NSObject {
1818

1919
public func getBalance(address: _ObjCEthereumAddress, onBlock: NSString = "latest", error: NSErrorPointer) -> _ObjCBigUInt? {
2020
guard let addr = address.address else {
21-
error?.pointee = Web3Error.inputError("Address is empty") as NSError
21+
error?.pointee = Web3Error.inputError(desc: "Address is empty") as NSError
2222
return nil
2323
}
2424
guard let result = self.web3?.eth.getBalance(address: addr, onBlock: onBlock as String) else {
25-
error?.pointee = Web3Error.processingError("Web3 object was not properly initialized") as NSError
25+
error?.pointee = Web3Error.processingError(desc: "Web3 object was not properly initialized") as NSError
2626
return nil
2727
}
2828
switch result {

‎web3swift/Promises/Classes/Promise+Batching.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ public class JSONRPCrequestDispatcher {
3838
var triggered : Bool = false
3939
func add(_ request: JSONRPCrequest, maxWaitTime: TimeInterval) throws -> Promise<JSONRPCresponse> {
4040
if self.triggered {
41-
throw Web3Error.nodeError("Batch is already in flight")
41+
throw Web3Error.nodeError(desc: "Batch is already in flight")
4242
}
4343
let requestID = request.id
4444
let promiseToReturn = Promise<JSONRPCresponse>.pending()
4545
self.lockQueue.async {
4646
if self.promisesDict[requestID] != nil {
47-
promiseToReturn.resolver.reject(Web3Error.processingError("Request ID collision"))
47+
promiseToReturn.resolver.reject(Web3Error.processingError(desc: "Request ID collision"))
4848
}
4949
self.promisesDict[requestID] = promiseToReturn
5050
self.requests.append(request)
@@ -71,7 +71,7 @@ public class JSONRPCrequestDispatcher {
7171
for response in batch.responses {
7272
if self.promisesDict[UInt64(response.id)] == nil {
7373
for k in self.promisesDict.keys {
74-
self.promisesDict[k]?.resolver.reject(Web3Error.nodeError("Unknown request id"))
74+
self.promisesDict[k]?.resolver.reject(Web3Error.nodeError(desc: "Unknown request id"))
7575
}
7676
return
7777
}
@@ -98,7 +98,7 @@ public class JSONRPCrequestDispatcher {
9898

9999
func getBatch() throws -> Batch {
100100
guard case .Batch(let batchLength) = self.policy else {
101-
throw Web3Error.inputError("Trying to batch a request when policy is not to batch")
101+
throw Web3Error.inputError(desc: "Trying to batch a request when policy is not to batch")
102102
}
103103
let currentBatch = self.batches.last!
104104
if currentBatch.requests.count % batchLength == 0 || currentBatch.triggered {

‎web3swift/Promises/Classes/Promise+HttpProvider.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extension Web3HttpProvider {
3333
return
3434
}
3535
guard data != nil else {
36-
rp.resolver.reject(Web3Error.nodeError("Node response is empty"))
36+
rp.resolver.reject(Web3Error.nodeError(desc: "Node response is empty"))
3737
return
3838
}
3939
rp.resolver.fulfill(data!)
@@ -48,7 +48,7 @@ extension Web3HttpProvider {
4848
}.map(on: queue){ (data: Data) throws -> JSONRPCresponse in
4949
let parsedResponse = try JSONDecoder().decode(JSONRPCresponse.self, from: data)
5050
if parsedResponse.error != nil {
51-
throw Web3Error.nodeError("Received an error message from node\n" + String(describing: parsedResponse.error!))
51+
throw Web3Error.nodeError(desc: "Received an error message from node\n" + String(describing: parsedResponse.error!))
5252
}
5353
return parsedResponse
5454
}
@@ -76,7 +76,7 @@ extension Web3HttpProvider {
7676
return
7777
}
7878
guard data != nil, data!.count != 0 else {
79-
rp.resolver.reject(Web3Error.nodeError("Node response is empty"))
79+
rp.resolver.reject(Web3Error.nodeError(desc: "Node response is empty"))
8080
return
8181
}
8282
rp.resolver.fulfill(data!)
@@ -98,7 +98,7 @@ extension Web3HttpProvider {
9898

9999
public func sendAsync(_ request: JSONRPCrequest, queue: DispatchQueue = .main) -> Promise<JSONRPCresponse> {
100100
if request.method == nil {
101-
return Promise(error: Web3Error.nodeError("RPC method is nill"))
101+
return Promise(error: Web3Error.nodeError(desc: "RPC method is nill"))
102102
}
103103

104104
return Web3HttpProvider.post(request, providerURL: self.url, queue: queue, session: self.session)

‎web3swift/Promises/Classes/Promise+Web3+Eth+Call.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ extension web3.Eth {
1515
let queue = web3.requestDispatcher.queue
1616
do {
1717
guard let request = EthereumTransaction.createRequest(method: .call, transaction: transaction, onBlock: onBlock, options: options) else {
18-
throw Web3Error.processingError("Transaction is invalid")
18+
throw Web3Error.processingError(desc: "Transaction is invalid")
1919
}
2020
let rp = web3.dispatch(request)
2121
return rp.map(on: queue ) { response in
2222
guard let value: Data = response.getValue() else {
2323
if response.error != nil {
24-
throw Web3Error.nodeError(response.error!.message)
24+
throw Web3Error.nodeError(desc: response.error!.message)
2525
}
26-
throw Web3Error.nodeError("Invalid value from Ethereum node")
26+
throw Web3Error.nodeError(desc: "Invalid value from Ethereum node")
2727
}
2828
return value
2929
}

‎web3swift/Promises/Classes/Promise+Web3+Eth+EstimateGas.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ extension web3.Eth {
1616
let queue = web3.requestDispatcher.queue
1717
do {
1818
guard let request = EthereumTransaction.createRequest(method: .estimateGas, transaction: transaction, onBlock: onBlock, options: options) else {
19-
throw Web3Error.processingError("Transaction is invalid")
19+
throw Web3Error.processingError(desc: "Transaction is invalid")
2020
}
2121
let rp = web3.dispatch(request)
2222
return rp.map(on: queue ) { response in
2323
guard let value: BigUInt = response.getValue() else {
2424
if response.error != nil {
25-
throw Web3Error.nodeError(response.error!.message)
25+
throw Web3Error.nodeError(desc: response.error!.message)
2626
}
27-
throw Web3Error.nodeError("Invalid value from Ethereum node")
27+
throw Web3Error.nodeError(desc: "Invalid value from Ethereum node")
2828
}
2929
return value
3030
}

‎web3swift/Promises/Classes/Promise+Web3+Eth+GetAccounts.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ extension web3.Eth {
3131
return rp.map(on: queue ) { response in
3232
guard let value: [EthereumAddress] = response.getValue() else {
3333
if response.error != nil {
34-
throw Web3Error.nodeError(response.error!.message)
34+
throw Web3Error.nodeError(desc: response.error!.message)
3535
}
36-
throw Web3Error.nodeError("Invalid value from Ethereum node")
36+
throw Web3Error.nodeError(desc: "Invalid value from Ethereum node")
3737
}
3838
return value
3939
}

‎web3swift/Promises/Classes/Promise+Web3+Eth+GetBalance.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ extension web3.Eth {
2222
return rp.map(on: queue ) { response in
2323
guard let value: BigUInt = response.getValue() else {
2424
if response.error != nil {
25-
throw Web3Error.nodeError(response.error!.message)
25+
throw Web3Error.nodeError(desc: response.error!.message)
2626
}
27-
throw Web3Error.nodeError("Invalid value from Ethereum node")
27+
throw Web3Error.nodeError(desc: "Invalid value from Ethereum node")
2828
}
2929
return value
3030
}

‎web3swift/Promises/Classes/Promise+Web3+Eth+GetBlockByHash.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ extension web3.Eth {
2323
return rp.map(on: queue ) { response in
2424
guard let value: Block = response.getValue() else {
2525
if response.error != nil {
26-
throw Web3Error.nodeError(response.error!.message)
26+
throw Web3Error.nodeError(desc: response.error!.message)
2727
}
28-
throw Web3Error.nodeError("Invalid value from Ethereum node")
28+
throw Web3Error.nodeError(desc: "Invalid value from Ethereum node")
2929
}
3030
return value
3131
}

0 commit comments

Comments
 (0)