% == 0 changed into isMultiple (SE-0225 support)

Author: TonioMacaronio

web3swift/KeystoreManager/Classes/BIP32Keystore.swift

@@ -238,7 +238,7 @@ public class BIP32Keystore: AbstractKeystore {
         let derivedKeyLast16bytes = derivedKey[(derivedKey.count - 16)...(derivedKey.count - 1)]
         dataForMAC.append(derivedKeyLast16bytes)
         guard let cipherText = Data.fromHex(keystorePars.crypto.ciphertext) else {return nil}
-        guard (cipherText.count % 32 == 0) else {return nil}
+        guard (cipherText.count.isMultiple(of: 32)) else {return nil}
         dataForMAC.append(cipherText)
         let mac = dataForMAC.sha3(.keccak256)
         guard let calculatedMac = Data.fromHex(keystorePars.crypto.mac), mac.constantTimeComparisonTo(calculatedMac) else {return nil}

web3swift/KeystoreManager/Classes/BIP39.swift

@@ -91,15 +91,15 @@ public class BIP39 {
     }
 
     static public func generateMnemonics(bitsOfEntropy: Int, language: BIP39Language = BIP39Language.english) throws -> String? {
-        guard bitsOfEntropy >= 128 && bitsOfEntropy <= 256 && bitsOfEntropy % 32 == 0 else {return nil}
+        guard bitsOfEntropy >= 128 && bitsOfEntropy <= 256 && bitsOfEntropy.isMultiple(of: 32) else {return nil}
         guard let entropy = Data.randomBytes(length: bitsOfEntropy/8) else {throw AbstractKeystoreError.noEntropyError}
         return BIP39.generateMnemonicsFromEntropy(entropy: entropy, language: language)
 
     }
 
     static public func mnemonicsToEntropy(_ mnemonics: String, language: BIP39Language = BIP39Language.english) -> Data? {
         let wordList = mnemonics.components(separatedBy: " ")
-        guard wordList.count >= 12 && wordList.count % 4 == 0 else {return nil}
+        guard wordList.count >= 12 && wordList.count.isMultiple(of: 4) else {return nil}
         var bitString = ""
         for word in wordList {
             let idx = language.words.firstIndex(of: word)
@@ -111,7 +111,7 @@ public class BIP39 {
             bitString.append(stringForm)
         }
         let stringCount = bitString.count
-        if stringCount % 33 != 0 {
+        if !stringCount.isMultiple(of: 33) {
             return nil
         }
         let entropyBits = bitString[0 ..< (bitString.count - bitString.count/33)]

web3swift/Promises/Classes/Promise+Batching.swift

@@ -99,7 +99,7 @@ public class JSONRPCrequestDispatcher {
             throw Web3Error.inputError(desc: "Trying to batch a request when policy is not to batch")
         }
         let currentBatch = self.batches.last!
-        if currentBatch.requests.count % batchLength == 0 || currentBatch.triggered {
+        if currentBatch.requests.count.isMultiple(of: batchLength) || currentBatch.triggered {
             let newBatch = Batch(provider: self.provider, capacity: Int(batchLength), queue: self.queue, lockQueue: self.lockQueue)
             self.batches.append(newBatch)
             return newBatch