Refactor callbacks

Sources/ElixxirDAppsSDK/Callbacks/AuthCallbacks.swift

@@ -23,12 +23,12 @@ extension AuthCallbacks {
 
 extension AuthCallbacks {
   func makeBindingsAuthCallbacks() -> BindingsAuthCallbacksProtocol {
-    class Handler: NSObject, BindingsAuthCallbacksProtocol {
-      init(_ callbacks: AuthCallbacks) {
-        self.callbacks = callbacks
+    class CallbackObject: NSObject, BindingsAuthCallbacksProtocol {
+      init(_ callback: AuthCallbacks) {
+        self.callback = callback
       }
 
-      let callbacks: AuthCallbacks
+      let callback: AuthCallbacks
 
       func confirm(_ contact: Data?, receptionId: Data?, ephemeralId: Int64, roundId: Int64) {
         guard let contact = contact else {
@@ -37,7 +37,7 @@ extension AuthCallbacks {
         guard let receptionId = receptionId else {
           fatalError("BindingsAuthCallbacks.confirm received `nil` receptionId")
         }
-        callbacks.handle(.confirm(
+        callback.handle(.confirm(
           contact: contact,
           receptionId: receptionId,
           ephemeralId: ephemeralId,
@@ -52,7 +52,7 @@ extension AuthCallbacks {
         guard let receptionId = receptionId else {
           fatalError("BindingsAuthCallbacks.request received `nil` receptionId")
         }
-        callbacks.handle(.request(
+        callback.handle(.request(
           contact: contact,
           receptionId: receptionId,
           ephemeralId: ephemeralId,
@@ -67,7 +67,7 @@ extension AuthCallbacks {
         guard let receptionId = receptionId else {
           fatalError("BindingsAuthCallbacks.reset received `nil` receptionId")
         }
-        callbacks.handle(.reset(
+        callback.handle(.reset(
           contact: contact,
           receptionId: receptionId,
           ephemeralId: ephemeralId,
@@ -76,6 +76,6 @@ extension AuthCallbacks {
       }
     }
 
-    return Handler(self)
+    return CallbackObject(self)
   }
 }

Sources/ElixxirDAppsSDK/Callbacks/ClientErrorCallback.swift

@@ -17,7 +17,7 @@ extension ClientErrorCallback {
 
 extension ClientErrorCallback {
   func makeBindingsClientError() -> BindingsClientErrorProtocol {
-    class Reporter: NSObject, BindingsClientErrorProtocol {
+    class CallbackObject: NSObject, BindingsClientErrorProtocol {
       init(_ callback: ClientErrorCallback) {
         self.callback = callback
       }
@@ -42,6 +42,6 @@ extension ClientErrorCallback {
       }
     }
 
-    return Reporter(self)
+    return CallbackObject(self)
   }
 }

Sources/ElixxirDAppsSDK/Callbacks/HealthCallback.swift

@@ -17,18 +17,18 @@ extension HealthCallback {
 
 extension HealthCallback {
   func makeBindingsHealthCallback() -> BindingsNetworkHealthCallbackProtocol {
-    class Callback: NSObject, BindingsNetworkHealthCallbackProtocol {
-      init(_ healthCallback: HealthCallback) {
-        self.healthCallback = healthCallback
+    class CallbackObject: NSObject, BindingsNetworkHealthCallbackProtocol {
+      init(_ callback: HealthCallback) {
+        self.callback = callback
       }
 
-      let healthCallback: HealthCallback
+      let callback: HealthCallback
 
       func callback(_ p0: Bool) {
-        healthCallback.handle(p0)
+        callback.handle(p0)
       }
     }
 
-    return Callback(self)
+    return CallbackObject(self)
   }
 }

Sources/ElixxirDAppsSDK/Callbacks/Listener.swift

@@ -23,29 +23,29 @@ extension Listener {
 
 extension Listener {
   func makeBindingsListener() -> BindingsListenerProtocol {
-    class Callback: NSObject, BindingsListenerProtocol {
-      init(_ listener: Listener) {
-        self.listener = listener
+    class CallbackObject: NSObject, BindingsListenerProtocol {
+      init(_ callback: Listener) {
+        self.callback = callback
       }
 
-      let listener: Listener
+      let callback: Listener
 
       func hear(_ item: Data?) {
         guard let item = item else {
           fatalError("BindingsListener.hear received `nil`")
         }
         do {
-          listener.handle(try Message.decode(item))
+          callback.handle(try Message.decode(item))
         } catch {
           fatalError("BindingsListener.hear message decoding failed with error: \(error)")
         }
       }
 
       func name() -> String {
-        listener.name
+        callback.name
       }
     }
 
-    return Callback(self)
+    return CallbackObject(self)
   }
 }

Sources/ElixxirDAppsSDK/Callbacks/LogWriter.swift

@@ -17,21 +17,21 @@ extension LogWriter {
 
 extension LogWriter {
   func makeBindingsLogWriter() -> BindingsLogWriterProtocol {
-    class Writer: NSObject, BindingsLogWriterProtocol {
-      init(_ writer: LogWriter) {
-        self.writer = writer
+    class CallbackObject: NSObject, BindingsLogWriterProtocol {
+      init(_ callback: LogWriter) {
+        self.callback = callback
       }
 
-      let writer: LogWriter
+      let callback: LogWriter
 
       func log(_ p0: String?) {
         guard let p0 = p0 else {
           fatalError("BindingsLogWriter.log received `nil`")
         }
-        writer.handle(p0)
+        callback.handle(p0)
       }
     }
 
-    return Writer(self)
+    return CallbackObject(self)
   }
 }

Sources/ElixxirDAppsSDK/Callbacks/MessageDeliveryCallback.swift

@@ -22,7 +22,7 @@ extension MessageDeliveryCallback {
 
 extension MessageDeliveryCallback {
   func makeBindingsMessageDeliveryCallback() -> BindingsMessageDeliveryCallbackProtocol {
-    class Callback: NSObject, BindingsMessageDeliveryCallbackProtocol {
+    class CallbackObject: NSObject, BindingsMessageDeliveryCallbackProtocol {
       init(_ callback: MessageDeliveryCallback) {
         self.callback = callback
       }
@@ -53,6 +53,6 @@ extension MessageDeliveryCallback {
       }
     }
 
-    return Callback(self)
+    return CallbackObject(self)
   }
 }

Sources/ElixxirDAppsSDK/Callbacks/Processor.swift

@@ -35,11 +35,11 @@ extension Processor {
 extension Processor {
   func makeBindingsProcessor() -> BindingsProcessorProtocol {
     class CallbackObject: NSObject, BindingsProcessorProtocol {
-      init(_ processor: Processor) {
-        self.processor = processor
+      init(_ callback: Processor) {
+        self.callback = callback
       }
 
-      let processor: Processor
+      let callback: Processor
 
       func process(_ message: Data?, receptionId: Data?, ephemeralId: Int64, roundId: Int64) {
         guard let message = message else {
@@ -48,7 +48,7 @@ extension Processor {
         guard let receptionId = receptionId else {
           fatalError("BindingsProcessor.process received `nil` receptionId")
         }
-        processor.process(Callback(
+        callback.process(Callback(
           message: message,
           receptionId: receptionId,
           ephemeralId: ephemeralId,
@@ -57,7 +57,7 @@ extension Processor {
       }
 
       func string() -> String {
-        processor.serviceTag
+        callback.serviceTag
       }
     }
 

Sources/ElixxirDAppsSDK/Callbacks/RestlikeCallback.swift

@@ -17,7 +17,7 @@ extension RestlikeCallback {
 
 extension RestlikeCallback {
   func makeBindingsRestlikeCallback() -> BindingsRestlikeCallbackProtocol {
-    class Callback: NSObject, BindingsRestlikeCallbackProtocol {
+    class CallbackObject: NSObject, BindingsRestlikeCallbackProtocol {
       init(_ callback: RestlikeCallback) {
         self.callback = callback
       }
@@ -39,6 +39,6 @@ extension RestlikeCallback {
       }
     }
 
-    return Callback(self)
+    return CallbackObject(self)
   }
 }

Sources/ElixxirDAppsSDK/Callbacks/SingleUseResponse.swift

@@ -17,7 +17,7 @@ extension SingleUseResponse {
 
 extension SingleUseResponse {
   func makeBindingsSingleUseResponse() -> BindingsSingleUseResponseProtocol {
-    class Response: NSObject, BindingsSingleUseResponseProtocol {
+    class CallbackObject: NSObject, BindingsSingleUseResponseProtocol {
       init(_ callback: SingleUseResponse) {
         self.callback = callback
       }
@@ -39,6 +39,6 @@ extension SingleUseResponse {
       }
     }
 
-    return Response(self)
+    return CallbackObject(self)
   }
 }