make RlpKey enum CaseIterable and remove total to use RlpKey.allCases.count instead

Author: mloit

Sources/web3swift/Transaction/EIP1559Envelope.swift

@@ -122,7 +122,7 @@ extension EIP1559Envelope {
         self.s = try container.decodeHex(to: BigUInt.self, key: .s)
     }
 
-    private enum RlpKey: Int {
+    private enum RlpKey: Int, CaseIterable {
         case chainId
         case nonce
         case maxPriorityFeePerGas
@@ -135,17 +135,16 @@ extension EIP1559Envelope {
         case sig_v
         case sig_r
         case sig_s
-        case total // not a real entry, used to auto-size based on number of keys
     }
 
     public init?(rawValue: Data) {
         // pop the first byte from the stream [EIP-2718]
         let typeByte: UInt8 = rawValue.first ?? 0 // can't decode if we're the wrong type
-        if typeByte != self.type.rawValue { return nil }
+        guard self.type.rawValue == typeByte else { return nil }
 
         guard let totalItem = RLP.decode(rawValue.dropFirst(1)) else { return nil }
         guard let rlpItem = totalItem[0] else { return nil }
-        if rlpItem.count != RlpKey.total.rawValue { return nil }
+        guard RlpKey.allCases.count == rlpItem.count else { return nil }
 
         // we've validated the item count, so rlpItem[keyName] is guaranteed to return something not nil
         // swiftlint:disable force_unwrapping

Sources/web3swift/Transaction/EIP2930Envelope.swift

@@ -105,7 +105,7 @@ extension EIP2930Envelope {
     }
 
     // RLP encoding positions
-    fileprivate enum RlpKey: Int {
+    private enum RlpKey: Int, CaseIterable {
         case chainId
         case nonce
         case gasPrice
@@ -117,17 +117,16 @@ extension EIP2930Envelope {
         case sig_v
         case sig_r
         case sig_s
-        case total // not a real entry, used to auto-size based on number of keys
     }
 
     public init?(rawValue: Data) {
         // pop the first byte from the stream [EIP-2718]
         let typeByte: UInt8 = rawValue.first ?? 0 // can't decode if we're the wrong type
-        if typeByte != self.type.rawValue { return nil }
+        guard self.type.rawValue == typeByte else { return nil }
 
         guard let totalItem = RLP.decode(rawValue.dropFirst(1)) else { return nil }
         guard let rlpItem = totalItem[0] else { return nil }
-        if rlpItem.count != RlpKey.total.rawValue { return nil }
+        guard RlpKey.allCases.count == rlpItem.count else { return nil }
 
         // we've validated the item count, so rlpItem[keyIndex] is guaranteed to return something not nil
         // swiftlint:disable force_unwrapping

Sources/web3swift/Transaction/LegacyEnvelope.swift

@@ -107,7 +107,7 @@ extension LegacyEnvelope {
         self.s = try container.decodeHex(to: BigUInt.self, key: .s)
     }
 
-    fileprivate enum RlpKey: Int {
+    private enum RlpKey: Int, CaseIterable {
         case nonce
         case gasPrice
         case gasLimit
@@ -117,13 +117,12 @@ extension LegacyEnvelope {
         case sig_v
         case sig_r
         case sig_s
-        case total
     }
 
     public init?(rawValue: Data) {
         guard let totalItem = RLP.decode(rawValue) else { return nil }
         guard let rlpItem = totalItem[0] else { return nil }
-        if rlpItem.count != RlpKey.total.rawValue { return nil }
+        guard RlpKey.allCases.count == rlpItem.count else { return nil }
 
         // we've validated the item count, so rlpItem[key] is guaranteed to return something not nil
         // swiftlint:disable force_unwrapping