From d302d98474843d02dd891c8f8ee242ccff5d867b Mon Sep 17 00:00:00 2001 From: Francisco Gindre Date: Mon, 15 Mar 2021 10:18:28 -0300 Subject: [PATCH 1/3] fix logger compile errors --- ZcashLightClientKit/Utils/LoggingProxy.swift | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ZcashLightClientKit/Utils/LoggingProxy.swift b/ZcashLightClientKit/Utils/LoggingProxy.swift index 5804e129..bfe06b5f 100644 --- a/ZcashLightClientKit/Utils/LoggingProxy.swift +++ b/ZcashLightClientKit/Utils/LoggingProxy.swift @@ -12,15 +12,15 @@ import Foundation */ public protocol Logger { - func debug(_ message: String, file: String, function: String, line: Int) + func debug(_ message: String, file: StaticString, function: StaticString, line: Int) - func info(_ message: String, file: String, function: String, line: Int) + func info(_ message: String, file: StaticString, function: StaticString, line: Int) - func event(_ message: String, file: String, function: String, line: Int) + func event(_ message: String, file: StaticString, function: StaticString, line: Int) - func warn(_ message: String, file: String, function: String, line: Int) + func warn(_ message: String, file: StaticString, function: StaticString, line: Int) - func error(_ message: String, file: String, function: String, line: Int) + func error(_ message: String, file: StaticString, function: StaticString, line: Int) } @@ -28,23 +28,23 @@ var logger: Logger? class LoggerProxy { - static func debug(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + static func debug(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { logger?.debug(message, file: file, function: function, line: line) } - static func info(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + static func info(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { logger?.info(message, file: file, function: function, line: line) } - static func event(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + static func event(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { logger?.event(message, file: file, function: function, line: line) } - static func warn(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + static func warn(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { logger?.warn(message, file: file, function: function, line: line) } - static func error(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + static func error(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { logger?.error(message, file: file, function: function, line: line) } From 14a5a02966f05c2748a08f622bfd2a55f0db2284 Mon Sep 17 00:00:00 2001 From: Francisco Gindre Date: Mon, 15 Mar 2021 10:52:53 -0300 Subject: [PATCH 2/3] Logger fixes --- .../ZcashLightClientSample/SampleLogger.swift | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/Example/ZcashLightClientSample/ZcashLightClientSample/SampleLogger.swift b/Example/ZcashLightClientSample/ZcashLightClientSample/SampleLogger.swift index e385269c..10f58c4f 100644 --- a/Example/ZcashLightClientSample/ZcashLightClientSample/SampleLogger.swift +++ b/Example/ZcashLightClientSample/ZcashLightClientSample/SampleLogger.swift @@ -19,44 +19,54 @@ class SampleLogger: ZcashLightClientKit.Logger { case info } + enum LoggerType { + case osLog + case printerLog + } + var level: LogLevel - init(logLevel: LogLevel) { + var loggerType: LoggerType + + init(logLevel: LogLevel, type: LoggerType = .osLog) { self.level = logLevel + self.loggerType = type } private static let subsystem = Bundle.main.bundleIdentifier! - static let oslog = OSLog(subsystem: subsystem, category: "sample-logs") + static let oslog = OSLog(subsystem: subsystem, category: "logs") - func debug(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + func debug(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { guard level.rawValue == LogLevel.debug.rawValue else { return } log(level: "DEBUG 🐞", message: message, file: file, function: function, line: line) } - func error(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + func error(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { guard level.rawValue <= LogLevel.error.rawValue else { return } log(level: "ERROR 💥", message: message, file: file, function: function, line: line) } - func warn(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + func warn(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { guard level.rawValue <= LogLevel.warning.rawValue else { return } log(level: "WARNING ⚠️", message: message, file: file, function: function, line: line) } - func event(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + func event(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { guard level.rawValue <= LogLevel.event.rawValue else { return } log(level: "EVENT ⏱", message: message, file: file, function: function, line: line) } - func info(_ message: String, file: String = #file, function: String = #function, line: Int = #line) { + func info(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { guard level.rawValue <= LogLevel.info.rawValue else { return } log(level: "INFO ℹ️", message: message, file: file, function: function, line: line) } - private func log(level: String, message: String, file: String, function: String, line: Int) { - let fileName = file as NSString - - os_log("[%@] %@ - %@ - Line: %d -> %@", log: Self.oslog, type: .default, level, fileName.lastPathComponent, function, line, message) + private func log(level: String, message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) { + let fileName = (String(describing: file) as NSString).lastPathComponent + switch loggerType { + case .printerLog: + print("[\(level)] \(fileName) - \(function) - line: \(line) -> \(message)") + default: + os_log("[%{public}@] %{public}@ - %{public}@ - Line: %{public}d -> %{public}@", level, fileName, String(describing: function), line, message) + } } - - } From bad5c8e1794def122de97b4ec8700291b01e44ac Mon Sep 17 00:00:00 2001 From: Francisco Gindre Date: Mon, 15 Mar 2021 10:53:26 -0300 Subject: [PATCH 3/3] lint fixes --- ZcashLightClientKit/Rust/ZcashRustBackendWelding.swift | 1 - ZcashLightClientKit/Tool/DerivationTool.swift | 2 -- 2 files changed, 3 deletions(-) diff --git a/ZcashLightClientKit/Rust/ZcashRustBackendWelding.swift b/ZcashLightClientKit/Rust/ZcashRustBackendWelding.swift index e3a6939a..e2fcada5 100644 --- a/ZcashLightClientKit/Rust/ZcashRustBackendWelding.swift +++ b/ZcashLightClientKit/Rust/ZcashRustBackendWelding.swift @@ -54,7 +54,6 @@ public protocol ZcashRustBackendWelding { */ static func isValidExtendedFullViewingKey(_ key: String) throws -> Bool - /** initialize the accounts table from a given seed and a number of accounts - Parameters: diff --git a/ZcashLightClientKit/Tool/DerivationTool.swift b/ZcashLightClientKit/Tool/DerivationTool.swift index f2741914..5694a98e 100644 --- a/ZcashLightClientKit/Tool/DerivationTool.swift +++ b/ZcashLightClientKit/Tool/DerivationTool.swift @@ -236,6 +236,4 @@ extension DerivationTool: KeyValidation { throw KeyDerivationErrors.derivationError(underlyingError: error) } } - - }