signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'charlesmchen/randomnessVsNil'

Browse Source
This commit is contained in:
Matthew Chen 2019-07-29 14:59:27 -03:00
commit 28f6d686cb
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Podfile.lock
View File

@ -311,7 +311,7 @@ CHECKOUT OPTIONS:
:commit: 8da7c866b77d24266eb8975f3bb17fcf1065787b
:git: https://github.com/signalapp/SignalCoreKit.git
SignalMetadataKit:
:commit: 58e0316701af87e3fb681124ee80d4d800461d08
:commit: f7c0c7bd979cbac06223cd2d41da542c6c33f62b
:git: "git@github.com:signalapp/SignalMetadataKit-Private"
Starscream:
:commit: b09ea163c3cb305152c65b299cb024610f52e735

2
Pods

@ -1 +1 @@
Subproject commit 8d7085832d6a793faeb46d78630eea3ddf1bc7f9
Subproject commit ecabef92c79a4925fa431129fd487aded3fc3879

4
SignalServiceKit/tests/Messages/OWSUDManagerTest.swift
View File

@ -191,7 +191,7 @@ class OWSUDManagerTest: SSKBaseTestSwift {
let certificateData = try! SMKProtoServerCertificateCertificate.builder(id: 1,
key: serverKey ).buildSerializedData()
let signatureData = Randomness.generateRandomBytes(ECCSignatureLength)!
let signatureData = Randomness.generateRandomBytes(ECCSignatureLength)
let wrapperProto = SMKProtoServerCertificate.builder(certificate: certificateData,
signature: signatureData)
@ -211,7 +211,7 @@ class OWSUDManagerTest: SSKBaseTestSwift {
certificateBuilder.setSenderUuid(aliceUuid.uuidString)
let certificateData = try! certificateBuilder.buildSerializedData()
let signatureData = Randomness.generateRandomBytes(ECCSignatureLength)!
let signatureData = Randomness.generateRandomBytes(ECCSignatureLength)
let wrapperProto = try! SMKProtoSenderCertificate.builder(certificate: certificateData,
signature: signatureData).build()

8
SignalServiceKit/tests/Messages/Stickers/StickerManagerTest.swift
View File

@ -47,7 +47,7 @@ class StickerManagerTest: SSKBaseTestSwift {
XCTAssertEqual(0, StickerManager.suggestedStickers(forTextInput: "This is a flag: 🇨🇦").count)
let stickerInfo = StickerInfo.defaultValue
let stickerData = Randomness.generateRandomBytes(1)!
let stickerData = Randomness.generateRandomBytes(1)
let expectation = self.expectation(description: "Wait for sticker to be installed.")
StickerManager.installSticker(stickerInfo: stickerInfo,
@ -95,7 +95,7 @@ class StickerManagerTest: SSKBaseTestSwift {
XCTAssertEqual(0, stickerManager.suggestedStickers(forTextInput: "This is a flag: 🇨🇦").count)
let stickerInfo = StickerInfo.defaultValue
let stickerData = Randomness.generateRandomBytes(1)!
let stickerData = Randomness.generateRandomBytes(1)
let expectation = self.expectation(description: "Wait for sticker to be installed.")
StickerManager.installSticker(stickerInfo: stickerInfo,
@ -132,8 +132,8 @@ class StickerManagerTest: SSKBaseTestSwift {
}
func testInfos() {
let packId = Randomness.generateRandomBytes(16)!
let packKey = Randomness.generateRandomBytes(Int32(StickerManager.packKeyLength))!
let packId = Randomness.generateRandomBytes(16)
let packKey = Randomness.generateRandomBytes(Int32(StickerManager.packKeyLength))
let stickerId: UInt32 = 0
XCTAssertEqual(StickerPackInfo(packId: packId, packKey: packKey),

2
SignalServiceKit/tests/Storage/SDSDatabaseStorageTest.swift
View File

@ -51,7 +51,7 @@ class SDSDatabaseStorageTest: SSKBaseTestSwift {
XCTAssertEqual(1, TSThread.anyFetchAll(databaseStorage: storage).count)
let groupId = Randomness.generateRandomBytes(Int32(kGroupIdLength))!
let groupId = Randomness.generateRandomBytes(Int32(kGroupIdLength))
let groupModel = TSGroupModel(title: "Test Group",
members: [contactAddress],
image: nil,

6
SignalServiceKit/tests/Storage/SDSKeyValueStoreTest.swift
View File

@ -79,8 +79,8 @@ class SDSKeyValueStoreTest: SSKBaseTestSwift {
func test_data() {
let store = SDSKeyValueStore(collection: "test")
let bytesA = Randomness.generateRandomBytes(32)!
let bytesB = Randomness.generateRandomBytes(32)!
let bytesA = Randomness.generateRandomBytes(32)
let bytesB = Randomness.generateRandomBytes(32)
self.write { transaction in
XCTAssertNil(store.getData("dataA", transaction: transaction))
@ -153,7 +153,7 @@ class SDSKeyValueStoreTest: SSKBaseTestSwift {
XCTAssertFalse(store.hasValue(forKey: key, transaction: transaction))
}
let bytes = Randomness.generateRandomBytes(32)!
let bytes = Randomness.generateRandomBytes(32)
self.write { transaction in
let key = "data"
XCTAssertFalse(store.hasValue(forKey: key, transaction: transaction))