Эх сурвалжийг харах

Merge pull request #873 from evnik/patch-1

Optionality is removed from return type
Marcin Krzyzanowski 4 жил өмнө
parent
commit
54b2acbb61

+ 2 - 2
Sources/CryptoSwift/Foundation/Array+Foundation.swift

@@ -16,8 +16,8 @@
 import Foundation
 
 public extension Array where Element == UInt8 {
-  func toBase64() -> String? {
-    Data( self).base64EncodedString()
+  func toBase64() -> String {
+    Data(self).base64EncodedString()
   }
 
   init(base64: String) {

+ 1 - 1
Sources/CryptoSwift/String+Extension.swift

@@ -81,7 +81,7 @@ extension String {
   /// - parameter cipher: Instance of `Cipher`
   /// - returns: base64 encoded string of encrypted bytes
   @inlinable
-  public func encryptToBase64(cipher: Cipher) throws -> String? {
+  public func encryptToBase64(cipher: Cipher) throws -> String {
     try self.bytes.encrypt(cipher: cipher).toBase64()
   }
 

+ 1 - 1
Tests/CryptoSwiftTests/ExtensionsTest.swift

@@ -84,7 +84,7 @@ final class ExtensionsTest: XCTestCase {
     do {
       let cipher = try AES(key: "secret0key000000".bytes.md5(), blockMode: ECB())
       let encrypted = try "".encryptToBase64(cipher: cipher)
-      let decrypted = try encrypted?.decryptBase64ToString(cipher: cipher)
+      let decrypted = try encrypted.decryptBase64ToString(cipher: cipher)
       XCTAssertEqual("", decrypted)
 
       XCTAssertThrowsError(try "".decryptBase64(cipher: cipher))