chore: using new implementation of Data.randomBytes

Author: JeneaVranceanu

Sources/Web3Core/KeystoreManager/BIP32Keystore.swift

@@ -220,17 +220,13 @@ public class BIP32Keystore: AbstractKeystore {
         guard data.count == 82 else {
             throw AbstractKeystoreError.encryptionError("Invalid expected data length")
         }
-        guard let saltData = Data.randomBytes(length: 32) else {
-            throw AbstractKeystoreError.noEntropyError
-        }
+        let saltData = try Data.randomBytes(count: 32)
         guard let derivedKey = scrypt(password: password, salt: saltData, length: dkLen, N: N, R: R, P: P) else {
             throw AbstractKeystoreError.keyDerivationError
         }
         let last16bytes = derivedKey[(derivedKey.count - 16)...(derivedKey.count - 1)]
         let encryptionKey = derivedKey[0...15]
-        guard let IV = Data.randomBytes(length: 16) else {
-            throw AbstractKeystoreError.noEntropyError
-        }
+        let IV = try Data.randomBytes(count: 16)
         var aesCipher: AES?
         switch aesMode {
         case "aes-128-cbc":

Sources/Web3Core/KeystoreManager/BIP39.swift

@@ -95,13 +95,10 @@ public class BIP39 {
     }
 
     private static func entropyOf(size: Int) throws -> Data {
-        guard
-            size >= 128 && size <= 256 && size.isMultiple(of: 32),
-            let entropy = Data.randomBytes(length: size/8)
-        else {
+        guard size >= 128 && size <= 256 && size.isMultiple(of: 32) else {
             throw AbstractKeystoreError.noEntropyError
         }
-        return entropy
+        return try Data.randomBytes(count: size / 8)
     }
 
     static func bitarray(from data: Data) -> String {

Sources/Web3Core/KeystoreManager/EthereumKeystoreV3.swift

@@ -95,17 +95,13 @@ public class EthereumKeystoreV3: AbstractKeystore {
             throw AbstractKeystoreError.encryptionError("Encryption without key data")
         }
         let saltLen = 32
-        guard let saltData = Data.randomBytes(length: saltLen) else {
-            throw AbstractKeystoreError.noEntropyError
-        }
+        let saltData = try Data.randomBytes(count: saltLen)
         guard let derivedKey = scrypt(password: password, salt: saltData, length: dkLen, N: N, R: R, P: P) else {
             throw AbstractKeystoreError.keyDerivationError
         }
         let last16bytes = Data(derivedKey[(derivedKey.count - 16)...(derivedKey.count - 1)])
         let encryptionKey = Data(derivedKey[0...15])
-        guard let IV = Data.randomBytes(length: 16) else {
-            throw AbstractKeystoreError.noEntropyError
-        }
+        let IV = try Data.randomBytes(count: 16)
         var aesCipher: AES?
         switch aesMode {
         case "aes-128-cbc":

Tests/web3swiftTests/localTests/BIP39Tests.swift

@@ -25,7 +25,7 @@ final class BIP39Tests: XCTestCase {
     }
 
     func testBIP39SeedAndMnemConversions() throws {
-        let seed = Data.randomBytes(length: 32)!
+        let seed = try Data.randomBytes(count: 32)
         let mnemonics = BIP39.generateMnemonicsFromEntropy(entropy: seed)
         let recoveredSeed = BIP39.mnemonicsToEntropy(mnemonics!, language: .english)
         XCTAssert(seed == recoveredSeed)
@@ -95,7 +95,7 @@ final class BIP39Tests: XCTestCase {
     }
 
     func testBIP39SeedAndMnemConversionsArray() throws {
-        let seed = Data.randomBytes(length: 32)!
+        let seed = try Data.randomBytes(count: 32)
         let mnemonics = BIP39.generateMnemonicsFrom(entropy: seed)
         let recoveredSeed = BIP39.mnemonicsToEntropy(mnemonics, language: .english)
         XCTAssert(seed == recoveredSeed)

Tests/web3swiftTests/localTests/EthereumContractTest.swift

@@ -66,8 +66,8 @@ class EthereumContractTest: LocalTestCase {
         let web3 = try await Web3.new(LocalTestCase.url)
         let contract = try XCTUnwrap(web3.contract(EthereumContractTest.overloadedFunctionsABI, at: EthereumAddress("0x6394b37Cf80A7358b38068f0CA4760ad49983a1B")))
         let parameters: [Any] = [
-            [Data.randomBytes(length: 32), Data.randomBytes(length: 32)],
-            [Data.randomBytes(length: 32), Data.randomBytes(length: 32)]
+            [try Data.randomBytes(count: 32), try Data.randomBytes(count: 32)],
+            [try Data.randomBytes(count: 32), try Data.randomBytes(count: 32)]
         ]
         let functionNameWithParameters = "setData(bytes32[],bytes[])"
         let transaction = contract.createWriteOperation(functionNameWithParameters, parameters: parameters)
@@ -88,7 +88,7 @@ class EthereumContractTest: LocalTestCase {
     func test_encodeMethodBasedOnHexSignature() async throws {
         let web3 = try await Web3.new(LocalTestCase.url)
         let contract = try XCTUnwrap(web3.contract(EthereumContractTest.overloadedFunctionsABI, at: EthereumAddress("0x6394b37Cf80A7358b38068f0CA4760ad49983a1B")))
-        let parameters: [Any] = [Data.randomBytes(length: 32), Data.randomBytes(length: 32)]
+        let parameters: [Any] = [try Data.randomBytes(count: 32), try Data.randomBytes(count: 32)]
         let functionSignature = getFuncSignature("setData(bytes32,bytes)")
         let transaction = contract.createWriteOperation(functionSignature, parameters: parameters)
         XCTAssertNotNil(transaction)

Tests/web3swiftTests/localTests/KeystoresTests.swift

@@ -27,7 +27,7 @@ class KeystoresTests: LocalTestCase {
     }
 
     func testBIP39SeedAndMnemConversions() throws {
-        let seed = Data.randomBytes(length: 32)!
+        let seed = try Data.randomBytes(count: 32)
         let mnemonics = BIP39.generateMnemonicsFromEntropy(entropy: seed)
         let recoveredSeed = BIP39.mnemonicsToEntropy(mnemonics!, language: .english)
         XCTAssert(seed == recoveredSeed)
@@ -263,7 +263,7 @@ class KeystoresTests: LocalTestCase {
     }
 
     func testKeystoreDerivationTime() throws {
-        let privateKey = Data.randomBytes(length: 32)!
+        let privateKey = try Data.randomBytes(count: 32)
         measure {
             let ks = try! EthereumKeystoreV3(privateKey: privateKey, password: "TEST")!
             let account = ks.addresses!.first!
@@ -272,7 +272,7 @@ class KeystoresTests: LocalTestCase {
     }
 
     func testSingleScryptDerivation() throws {
-        let privateKey = Data.randomBytes(length: 32)!
+        let privateKey = try Data.randomBytes(count: 32)
         _ = try! EthereumKeystoreV3(privateKey: privateKey, password: "TEST")!
     }