cleanup

Author: pharms-eth

Sources/Core/Transaction/CodableTransaction.swift

@@ -188,18 +188,18 @@ public struct CodableTransaction {
         return self.envelope.encode(for: type)
     }
 
-    public mutating func resolve(provider: Web3Provider) async {
+    public mutating func resolve(provider: Web3Provider) async throws {
         // FIXME: Delete force try
-        self.gasLimit = try! await self.gasLimitPolicy.resolve(provider: provider, transaction: self)
+        self.gasLimit = try await self.gasLimitPolicy.resolve(provider: provider, transaction: self)
 
         if from != nil || sender != nil {
-            self.nonce = try! await self.resolveNonce(provider: provider)
+            self.nonce = try await self.resolveNonce(provider: provider)
         }
         if case .eip1559 = type {
-            self.maxFeePerGas = try! await self.maxFeePerGasPolicy.resolve(provider: provider)
-            self.maxPriorityFeePerGas = try! await self.maxPriorityFeePerGasPolicy.resolve(provider: provider)
+            self.maxFeePerGas = try await self.maxFeePerGasPolicy.resolve(provider: provider)
+            self.maxPriorityFeePerGas = try await self.maxPriorityFeePerGasPolicy.resolve(provider: provider)
         } else {
-            self.gasPrice = try! await self.gasPricePolicy.resolve(provider: provider)
+            self.gasPrice = try await self.gasPricePolicy.resolve(provider: provider)
         }
     }
 
@@ -380,12 +380,6 @@ extension CodableTransaction {
             return value
         }
     }
-
-
-
-
-
-
 }
 
 

Sources/Core/Transaction/Envelope/EIP1559Envelope.swift

@@ -249,8 +249,10 @@ extension EIP1559Envelope {
         let list = accessList.map { $0.encodeAsList() as AnyObject }
 
         switch type {
-        case .transaction: fields = [chainID, nonce, maxPriorityFeePerGas, maxFeePerGas, gasLimit, to.addressData, value, data, list, v, r, s] as [AnyObject]
-        case .signature: fields = [chainID, nonce, maxPriorityFeePerGas, maxFeePerGas, gasLimit, to.addressData, value, data, list] as [AnyObject]
+        case .transaction:
+            fields = [chainID, nonce, maxPriorityFeePerGas, maxFeePerGas, gasLimit, to.addressData, value, data, list, v, r, s] as [AnyObject]
+        case .signature:
+            fields = [chainID, nonce, maxPriorityFeePerGas, maxFeePerGas, gasLimit, to.addressData, value, data, list] as [AnyObject]
         }
         guard var result = RLP.encode(fields) else { return nil }
         result.insert(UInt8(self.type.rawValue), at: 0)

Sources/Core/Transaction/Envelope/EIP2930Envelope.swift

@@ -210,8 +210,10 @@ extension EIP2930Envelope {
         let list = accessList.map { $0.encodeAsList() as AnyObject }
 
         switch type {
-        case .transaction: fields = [chainID, nonce, gasPrice, gasLimit, to.addressData, value, data, list, v, r, s] as [AnyObject]
-        case .signature: fields = [chainID, nonce, gasPrice, gasLimit, to.addressData, value, data, list] as [AnyObject]
+        case .transaction:
+            fields = [chainID, nonce, gasPrice, gasLimit, to.addressData, value, data, list, v, r, s] as [AnyObject]
+        case .signature:
+            fields = [chainID, nonce, gasPrice, gasLimit, to.addressData, value, data, list] as [AnyObject]
         }
         guard var result = RLP.encode(fields) else { return nil }
         result.insert(UInt8(self.type.rawValue), at: 0)

Sources/Core/Transaction/Envelope/LegacyEnvelope.swift

@@ -194,7 +194,8 @@ extension LegacyEnvelope {
     public func encode(for type: EncodeType = .transaction) -> Data? {
         let fields: [AnyObject]
         switch type {
-        case .transaction: fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data, v, r, s] as [AnyObject]
+        case .transaction:
+            fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data, v, r, s] as [AnyObject]
         case .signature:
             if let chainID = self.chainID, chainID != 0 {
                 fields = [self.nonce, self.gasPrice, self.gasLimit, self.to.addressData, self.value, self.data, chainID, BigUInt(0), BigUInt(0)] as [AnyObject]

Sources/Core/Utility/Utilities.swift

@@ -162,19 +162,18 @@ public struct Utilities {
         if bigNumber == 0 {
             return "0"
         }
-        let unitDecimals = numberDecimals
         var toDecimals = formattingDecimals
-        if unitDecimals < toDecimals {
-            toDecimals = unitDecimals
+        if numberDecimals < toDecimals {
+            toDecimals = numberDecimals
         }
-        let divisor = BigUInt(10).power(unitDecimals)
+        let divisor = BigUInt(10).power(numberDecimals)
         let (quotient, remainder) = bigNumber.quotientAndRemainder(dividingBy: divisor)
-        var fullRemainder = String(remainder)
-        let fullPaddedRemainder = fullRemainder.leftPadding(toLength: unitDecimals, withPad: "0")
+        var fullRemainder = "\(remainder)"
+        let fullPaddedRemainder = fullRemainder.leftPadding(toLength: numberDecimals, withPad: "0")
         let remainderPadded = fullPaddedRemainder[0..<toDecimals]
         if remainderPadded == String(repeating: "0", count: toDecimals) {
             if quotient != 0 {
-                return String(quotient)
+                return "\(quotient)"
             } else if fallbackToScientific {
                 var firstDigit = 0
                 for char in fullPaddedRemainder {
@@ -205,9 +204,9 @@ public struct Utilities {
             }
         }
         if (toDecimals == 0) {
-            return String(quotient)
+            return "\(quotient)"
         }
-        return String(quotient) + decimalSeparator + remainderPadded
+        return "\(quotient)" + decimalSeparator + remainderPadded
     }
 
     /// Recover the Ethereum address from recoverable secp256k1 signature. Message is first hashed using the "personal hash" protocol.