Codable Config

OperatorFoundation · Dec 13, 2018 · dccd274 · dccd274
1 parent 9fbbc9f
commit dccd274
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/Sources/ReplicantSwift/Models/SequenceModel.swift b/Sources/ReplicantSwift/Models/SequenceModel.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct SequenceModel
+public struct SequenceModel: Codable
 {
     /// Byte Sequence.
     var sequence: Data

diff --git a/Sources/ReplicantSwift/Polish.swift b/Sources/ReplicantSwift/Polish.swift
@@ -21,10 +21,15 @@ public class Polish: NSObject
     public var publicKey: SecKey
     public var privateKey: SecKey
 
-    public init?(recipientPublicKey: SecKey?)
+    public init?(recipientPublicKeyData: Data?)
     {
         Polish.deleteKeys()
 
+        if let rPublicKeyData = recipientPublicKeyData
+        {
+            recipientPublicKey = Polish.decodeKey(fromData: rPublicKeyData)
+        }
+
         guard let newKeyPair = Polish.generateKeyPair()
         else
         {
@@ -33,7 +38,6 @@ public class Polish: NSObject
 
         self.privateKey = newKeyPair.privateKey
         self.publicKey = newKeyPair.publicKey
-        self.recipientPublicKey = recipientPublicKey
     }
 
     deinit

diff --git a/Sources/ReplicantSwift/ReplicantConfig.swift b/Sources/ReplicantSwift/ReplicantConfig.swift
@@ -7,16 +7,16 @@
 
 import Foundation
 
-public struct ReplicantConfig
+public struct ReplicantConfig: Codable
 {
-    public var serverPublicKey: SecKey
+    public var serverPublicKey: Data
     public var chunkSize: Int
     public var chunkTimeout: Int
     public var addSequences: [SequenceModel]?
     public var removeSequences: [SequenceModel]?
 
 
-    public init?(serverPublicKey: SecKey, chunkSize: Int, chunkTimeout: Int, addSequences: [SequenceModel]?, removeSequences: [SequenceModel]?)
+    public init?(serverPublicKey: Data, chunkSize: Int, chunkTimeout: Int, addSequences: [SequenceModel]?, removeSequences: [SequenceModel]?)
     {
         guard chunkSize >= keySize + aesOverheadSize
         else

diff --git a/Sources/ReplicantSwift/ReplicantServerConfig.swift b/Sources/ReplicantSwift/ReplicantServerConfig.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct ReplicantServerConfig
+public struct ReplicantServerConfig: Codable
 {
     public var chunkSize: Int
     public var chunkTimeout: Int

diff --git a/Sources/ReplicantSwift/ReplicantSwift.swift b/Sources/ReplicantSwift/ReplicantSwift.swift
@@ -10,7 +10,7 @@ public struct Replicant
 
     public init?(withConfig config: ReplicantConfig)
     {
-        guard let polish = Polish(recipientPublicKey: config.serverPublicKey)
+        guard let polish = Polish(recipientPublicKeyData: config.serverPublicKey)
         else
         {
             return nil
@@ -34,7 +34,7 @@ public struct ReplicantServer
 
     public init?(withConfig config: ReplicantServerConfig)
     {
-        guard let polish = Polish(recipientPublicKey: nil)
+        guard let polish = Polish(recipientPublicKeyData: nil)
             else
         {
             return nil