resolve reviews suggestions

Author: zhangliugang

Sources/Web3Core/Contract/ContractProtocol.swift

@@ -321,7 +321,7 @@ extension DefaultContractProtocol {
         }
 
         guard let function = methods[method]?.first else {
-            throw Web3Error.inputError(desc: "Function method does not exist.")
+            throw Web3Error.inputError(desc: "Make sure ABI you use contains '\(method)' method.")
         }
 
         switch data.count % 32 {
@@ -343,7 +343,7 @@ extension DefaultContractProtocol {
                     throw Web3Error.inputError(desc: "Signature matches \(customError.errorDeclaration) but failed to be decoded.")
                 }
             } else {
-                throw Web3Error.inputError(desc: "Found no matched error")
+                throw Web3Error.inputError(desc: "Make sure ABI you use contains error that can match signature: 0x\(selector.toHexString())")
             }
         default:
             throw Web3Error.inputError(desc: "Invalid data count")

Sources/Web3Core/EthereumABI/ABIElements.swift

@@ -240,7 +240,7 @@ extension ABI.Element.EthError {
     }
 
     /// Decodes `revert(string)` and `require(expression, string)` calls.
-    /// These calls are decomposed as `Error(string` error.
+    /// These calls are decomposed as `Error(string)` error.
     public static func decodeStringError(_ data: Data) -> String? {
         let decoded = ABIDecoder.decode(types: [.init(name: "", type: .string)], data: data)
         return decoded?.first as? String
@@ -411,6 +411,7 @@ extension ABI.Element.Function {
     /// // "_parsingError" is optional and is present only if decoding of custom error arguments failed
     /// "_parsingError": "Data matches MyCustomError(uint256, address senderAddress) but failed to be decoded."]
     /// ```
+    @available(*, deprecated, message: "Use `ABI.Element.EthError.decodeEthError(_:)` instead")
     public func decodeErrorResponse(_ data: Data, errors: [String: ABI.Element.EthError]? = nil) -> [String: Any]? {
         /// If data is empty and outputs are expected it is treated as a `require(expression)` or `revert()` call with no message.
         /// In solidity `require(false)` and `revert()` calls return empty error response.
@@ -442,7 +443,6 @@ extension ABI.Element.Function {
            let errors = errors,
            let customError = errors[data[data.startIndex ..< data.startIndex + 4].toHexString().stripHexPrefix()] {
             var errorResponse: [String: Any] = ["_success": false, "_abortedByRevertOrRequire": true, "_error": customError.errorDeclaration]
-//            customError.decodeEthError(data[4...])
 
             if (data.count > 32 && !customError.inputs.isEmpty),
                let decodedInputs = ABIDecoder.decode(types: customError.inputs, data: Data(data[data.startIndex + 4 ..< data.startIndex + data.count])) {

Sources/web3swift/Web3/Web3+HttpProvider.swift

@@ -37,9 +37,15 @@ public class Web3HttpProvider: Web3Provider {
             let response: String = try await APIRequest.send(APIRequest.getNetwork.call, parameter: [], with: self).result
             let result: UInt
             if response.hasHexPrefix() {
-                result = UInt(BigUInt(response, radix: 16) ?? Networks.Mainnet.chainID)
+                guard let num = BigUInt(response, radix: 16)  else {
+                    throw Web3Error.processingError(desc: "Get network successed but can't be parsed to a valid chain id")
+                }
+                result = UInt(num)
             } else {
-                result = UInt(response) ?? UInt(Networks.Mainnet.chainID)
+                guard let num = UInt(response) else {
+                    throw Web3Error.processingError(desc: "Get network successed but can't be parsed to a valid chain id")
+                }
+                result = num
             }
             self.network = Networks.fromInt(result)
         }

Tests/web3swiftTests/remoteTests/InfuraTests.swift

@@ -10,13 +10,6 @@ import Web3Core
 
 // MARK: Works only with network connection
 class InfuraTests: XCTestCase {
-
-    func testGetNetwork() async throws {
-        let requestURLstring = "https://" + Networks.Mainnet.name + Constants.infuraHttpScheme + Constants.infuraToken
-        let web3 = try await Web3HttpProvider(url: URL(string: requestURLstring)!, network: nil)
-        XCTAssertEqual(web3.network?.chainID, 1)
-    }
-
     func testGetBalance() async throws {
         let web3 = try await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
         let address = EthereumAddress("0xd61b5ca425F8C8775882d4defefC68A6979DBbce")!

Tests/web3swiftTests/remoteTests/Web3HttpProviderTests.swift

@@ -0,0 +1,33 @@
+//
+//  Web3HttpProviderTests.swift
+//
+//
+//  Created by liugang zhang on 2023/9/2.
+//
+
+import XCTest
+import Web3Core
+
+@testable import web3swift
+
+final class Web3HttpProviderTests: XCTestCase {
+    
+    /// if one of these rpc server lose efficacy, find a substitution from https://chainlist.org/
+    func testGetNetwork() async throws {
+        let requestURLstring = "https://" + Networks.Mainnet.name + Constants.infuraHttpScheme + Constants.infuraToken
+        var web3 = try await Web3HttpProvider(url: URL(string: requestURLstring)!, network: nil)
+        XCTAssertEqual(web3.network?.chainID, 1)
+
+        web3 = try await Web3HttpProvider(url: URL(string: "https://arbitrum-one.publicnode.com")!, network: nil)
+        XCTAssertEqual(web3.network?.chainID, 42161)
+
+        web3 = try await Web3HttpProvider(url: URL(string: "https://rpc.ankr.com/bsc")!, network: nil)
+        XCTAssertEqual(web3.network?.chainID, 56)
+
+        web3 = try await Web3HttpProvider(url: URL(string: "https://rpc-mainnet.maticvigil.com/")!, network: nil)
+        XCTAssertEqual(web3.network?.chainID, 137)
+
+        web3 = try await Web3HttpProvider(url: URL(string: "https://optimism.gateway.tenderly.co")!, network: nil)
+        XCTAssertEqual(web3.network?.chainID, 10)
+    }
+}