Make tests compatible with Swift 5 #605
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Newer versions of Swift have improved nil coalescing [1]. Unfortunately, this breaks our code. [1]: https://github.com/apple/swift-evolution/blob/master/proposals/0230-flatten-optional-try.md Consider the following: let encrypter = TSMessage(inSignVerifyModeWithPrivateKey: privateKeyData, peerPublicKey: publicKeyData) let signedMessage = try? encrypter?.wrap(message.data(using: .utf8)) let verifiedMessage = try? encrypter?.unwrapData(signedMessage!) let resultString = String(data: verifiedMessage!!, encoding: .utf8) Here "encrypter" is "TSMessage?" and then we "try?" to convert the error into an optional when acting on an optional "encrypter". In Swift 4 "verifiedMessage" has "Data??" type but Swift 5 flattens the optional chain and returns "Data?" instead. We cannot "unwrap!!" that twice. Update the tests to handle "nil" values more explicitly and avoid optional chaining with "try?". This results in code that compiles correctly with both Swift 4 & 5. P.S. Existing CocoaPods-based test project uses Swift 4 so the issue is not visible there. However, try updating the version and you'll see it.
ilammy
added
W-SwiftThemis 🔶
vixentael
approved these changes
Mar 19, 2020
|
I tested on my machine and can confirm: it's working. Thank you @ilammy. Let's merge! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Newer versions of Swift have improved nil coalescing (SE-0230). Unfortunately, this breaks our code.
Consider the following:
Here
encrypterisTSMessage?and then wetry?to convert the error into an optional when acting on an optionalencrypter. In Swift 4verifiedMessagehasData??type but Swift 5 flattens the optional chain and returnsData?instead. We cannotunwrap!!that twice.Update the tests to handle
nilvalues more explicitly and avoid optional chaining withtry?. This results in code that compiles correctly with both Swift 4 & 5.P.S. Existing CocoaPods-based test project uses Swift 4 so the issue is not visible there. However, try updating the version and you'll see it.
Checklist