From e8fe66ea9d3dc74a52bab2670a8cd43702d438d5 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 3 May 2019 11:09:55 +1000 Subject: [PATCH] Create BuildConfiguration --- LokiKit/BuildConfiguration.swift | 12 ++++++++++++ LokiKit/ProofOfWork.swift | 9 ++++----- Signal.xcodeproj/project.pbxproj | 4 ++++ 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 LokiKit/BuildConfiguration.swift diff --git a/LokiKit/BuildConfiguration.swift b/LokiKit/BuildConfiguration.swift new file mode 100644 index 000000000..8bc14f99d --- /dev/null +++ b/LokiKit/BuildConfiguration.swift @@ -0,0 +1,12 @@ + +enum BuildConfiguration { + case debug, production + + static let current: BuildConfiguration = { + #if DEBUG + return .debug + #else + return .production + #endif + }() +} diff --git a/LokiKit/ProofOfWork.swift b/LokiKit/ProofOfWork.swift index 62f2be578..e64108421 100644 --- a/LokiKit/ProofOfWork.swift +++ b/LokiKit/ProofOfWork.swift @@ -53,11 +53,10 @@ public enum ProofOfWork { private static let nonceLength = 8 private static let nonceTrialCount: Int = { - #if DEBUG - return 10 - #else - return 100 - #endif + switch BuildConfiguration.current { + case .debug: return 10 + case .production: return 100 + } }() struct Configuration { diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index e024d5731..e50fa52d1 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -558,6 +558,7 @@ B6FE7EB71ADD62FA00A6D22F /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B6FE7EB61ADD62FA00A6D22F /* PushKit.framework */; }; B821F2F82272CED3002C88C0 /* OnboardingAccountDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B821F2F72272CED3002C88C0 /* OnboardingAccountDetailsViewController.swift */; }; B821F2FA2272CEEE002C88C0 /* OnboardingKeyPairViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B821F2F92272CEEE002C88C0 /* OnboardingKeyPairViewController.swift */; }; + B858E395227BCB4F00C1722C /* BuildConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B858E394227BCB4F00C1722C /* BuildConfiguration.swift */; }; B8DC3D7722795E2400D909D6 /* ECKeyPair.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7422795E2300D909D6 /* ECKeyPair.swift */; }; B8DC3D7822795E2400D909D6 /* ECKeyPair.m in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7522795E2300D909D6 /* ECKeyPair.m */; }; B8DC3D7922795E2400D909D6 /* LokiMessagingAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8DC3D7622795E2400D909D6 /* LokiMessagingAPI.swift */; }; @@ -1351,6 +1352,7 @@ B6FE7EB61ADD62FA00A6D22F /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = System/Library/Frameworks/PushKit.framework; sourceTree = SDKROOT; }; B821F2F72272CED3002C88C0 /* OnboardingAccountDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingAccountDetailsViewController.swift; sourceTree = ""; }; B821F2F92272CEEE002C88C0 /* OnboardingKeyPairViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingKeyPairViewController.swift; sourceTree = ""; }; + B858E394227BCB4F00C1722C /* BuildConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuildConfiguration.swift; sourceTree = ""; }; B8DC3D7322795E2300D909D6 /* ECKeyPair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ECKeyPair.h; sourceTree = ""; }; B8DC3D7422795E2300D909D6 /* ECKeyPair.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ECKeyPair.swift; sourceTree = ""; }; B8DC3D7522795E2300D909D6 /* ECKeyPair.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ECKeyPair.m; sourceTree = ""; }; @@ -2616,6 +2618,7 @@ isa = PBXGroup; children = ( B8DC3D7A22795E2C00D909D6 /* Mnemonic */, + B858E394227BCB4F00C1722C /* BuildConfiguration.swift */, B8DC3D7322795E2300D909D6 /* ECKeyPair.h */, B8DC3D7522795E2300D909D6 /* ECKeyPair.m */, B8DC3D7422795E2300D909D6 /* ECKeyPair.swift */, @@ -3800,6 +3803,7 @@ 346B66311F4E29B200E5122F /* CropScaleImageViewController.swift in Sources */, 45E5A6991F61E6DE001E4A8A /* MarqueeLabel.swift in Sources */, 34D1F0B01F867BFC0066283D /* OWSSystemMessageCell.m in Sources */, + B858E395227BCB4F00C1722C /* BuildConfiguration.swift in Sources */, 45A663C51F92EC760027B59E /* GroupTableViewCell.swift in Sources */, 34CA631B2097806F00E526A0 /* OWSContactShareView.m in Sources */, 34D1F0861F8678AA0066283D /* ConversationViewController.m in Sources */,