From e8eac9f30b166362435a4248364139b57492af2d Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 10 Sep 2018 17:56:22 -0500
Subject: [PATCH] Clean up ahead of PR.

---
 .../src/Contacts/ContactDiscoveryService.m    |  2 +-
 .../src/Messages/OWSMessageManager.m          | 34 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m
index f3819b080..429cb4e67 100644
--- a/SignalServiceKit/src/Contacts/ContactDiscoveryService.m
+++ b/SignalServiceKit/src/Contacts/ContactDiscoveryService.m
@@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
         OWSFailDebug(@"Missing keyPair");
         return nil;
     }
-    if (serverStaticPublic.length < 1) {
+    if (serverEphemeralPublic.length < 1) {
         OWSFailDebug(@"Invalid serverEphemeralPublic");
         return nil;
     }
diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index d574fe17b..3de1a8d62 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -193,7 +193,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
     if (!TSAccountManager.isRegistered) {
@@ -248,7 +248,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -279,7 +279,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -324,7 +324,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
     if (envelope.timestamp < 1) {
@@ -405,7 +405,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -496,7 +496,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
     if (groupId.length < 1) {
@@ -540,7 +540,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -620,7 +620,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -665,7 +665,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -718,7 +718,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -872,7 +872,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -898,7 +898,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -977,7 +977,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -1035,7 +1035,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
     if (dataMessage.group.type != SSKProtoGroupContextTypeRequestInfo) {
@@ -1101,7 +1101,7 @@ NS_ASSUME_NONNULL_BEGIN
         return nil;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return nil;
     }
 
@@ -1289,7 +1289,7 @@ NS_ASSUME_NONNULL_BEGIN
         return;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return;
     }
 
@@ -1405,7 +1405,7 @@ NS_ASSUME_NONNULL_BEGIN
         return nil;
     }
     if (!transaction) {
-        OWSFailDebug(@"Missing transaction.");
+        OWSFail(@"Missing transaction.");
         return nil;
     }