Merge pull request #55 from XYOracleNetwork/refactor-fix

Refactor fix
XYOracleNetwork-v1 · Apr 3, 2020 · f99be53 · f99be53
2 parents 3360a53 + a2e02df
commit f99be53
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 38 deletions.
diff --git a/Example/Podfile b/Example/Podfile
@@ -3,5 +3,5 @@ platform :ios, '11.0'
 use_frameworks!
 
 target 'iOSExample' do
-  pod 'sdk-xyo-swift', '~> 1.0.8'
+  pod 'sdk-xyo-swift', '~> 1.0.11'
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -2,39 +2,39 @@ PODS:
   - PromisesObjC (1.2.8)
   - PromisesSwift (1.2.8):
     - PromisesObjC (= 1.2.8)
-  - sdk-core-swift (3.0.1):
-    - sdk-objectmodel-swift (~> 3.0)
+  - sdk-core-swift (3.1.2):
     - secp256k1.swift
-  - sdk-objectmodel-swift (3.0.3)
-  - sdk-xyo-swift (1.0.8):
-    - sdk-core-swift (~> 3.0.1)
-    - XyBleSdk (~> 3.0.7)
+  - sdk-xyo-swift (1.0.11):
+    - sdk-core-swift (~> 3.1.2)
+    - XyBleSdk (~> 3.1.2)
   - secp256k1.swift (0.1.4)
-  - XyBleSdk (3.0.7):
+  - XyBaseSdk (1.0.1):
     - PromisesSwift
+  - XyBleSdk (3.1.6):
+    - XyBaseSdk
 
 DEPENDENCIES:
-  - sdk-xyo-swift (~> 1.0.8)
+  - sdk-xyo-swift (~> 1.0.11)
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
     - PromisesObjC
     - PromisesSwift
     - sdk-core-swift
-    - sdk-objectmodel-swift
     - sdk-xyo-swift
     - secp256k1.swift
+    - XyBaseSdk
     - XyBleSdk
 
 SPEC CHECKSUMS:
   PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
   PromisesSwift: 37bad6f4daddb02f7c9c531efe91e8b21c13ee2f
-  sdk-core-swift: 6b089045fe8483388bd3c82d2d1375d796c29745
-  sdk-objectmodel-swift: a60e0bca94cac846589720322d63bf65b7eb584f
-  sdk-xyo-swift: 12e00678956df54114b2bac034a4bd144335e5b8
+  sdk-core-swift: 9f7c3edb2bc9819b5b0a64cdaf8a6eedcbd58ca2
+  sdk-xyo-swift: 6facd5b60ddda5c685678f6232c6b923f7f169ba
   secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
-  XyBleSdk: 8d63d5cba164fa7d05d662fca0231f065fddccbe
+  XyBaseSdk: 679d4f8ddbfc70ec1ff8a4cbdccf5bf81a1894f2
+  XyBleSdk: be5259286588d290cf79d9dfe2dce193de504f49
 
-PODFILE CHECKSUM: 6ab748911671415ab29cc0bb40cfff5dd8c5b01c
+PODFILE CHECKSUM: 8353ccfd77c4fa8b52aedb3fe7cff162becc3af8
 
 COCOAPODS: 1.9.1
diff --git a/Example/XyoSdkExample.xcodeproj/project.pbxproj b/Example/XyoSdkExample.xcodeproj/project.pbxproj
@@ -286,19 +286,19 @@
 				"${PODS_ROOT}/Target Support Files/Pods-iOSExample/Pods-iOSExample-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
 				"${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework",
+				"${BUILT_PRODUCTS_DIR}/XyBaseSdk/XyBaseSdk.framework",
 				"${BUILT_PRODUCTS_DIR}/XyBleSdk/XyBleSdk.framework",
 				"${BUILT_PRODUCTS_DIR}/sdk-core-swift/sdk_core_swift.framework",
-				"${BUILT_PRODUCTS_DIR}/sdk-objectmodel-swift/sdk_objectmodel_swift.framework",
 				"${BUILT_PRODUCTS_DIR}/sdk-xyo-swift/sdk_xyo_swift.framework",
 				"${BUILT_PRODUCTS_DIR}/secp256k1.swift/secp256k1.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XyBaseSdk.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XyBleSdk.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sdk_core_swift.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sdk_objectmodel_swift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sdk_xyo_swift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/secp256k1.framework",
 			);

diff --git a/Source/Heuristics/XyoHumanName.swift b/Source/Heuristics/XyoHumanName.swift
@@ -10,26 +10,26 @@ import Foundation
 import sdk_core_swift
 
 public struct XyoHumanName {
-    public static func getHumanName (boundWitmess: XyoBoundWitness, publicKey: XyoObjectStructure?) -> String {
+    public static func getHumanName (boundWitness: XyoBoundWitness, publicKey: XyoObjectStructure?) -> String {
         do {
-            guard let numberOfParties = try boundWitmess.getNumberOfParties() else {
+            guard let numberOfParties = try boundWitness.getNumberOfParties() else {
                 return "Invalid"
             }
 
             if (numberOfParties == 1) {
-                return try XyoHumanName.handleSinglePartyBlock(boundWitmess: boundWitmess, publicKey: publicKey)
+                return try XyoHumanName.handleSinglePartyBlock(boundWitness: boundWitness, publicKey: publicKey)
             }
 
-            return try XyoHumanName.handleMultiPartyBlock(boundWitmess: boundWitmess, publicKey: publicKey)
+            return try XyoHumanName.handleMultiPartyBlock(boundWitness: boundWitness, publicKey: publicKey)
 
         } catch {
             return "Invalid"
         }
 
     }
 
-    private static func handleSinglePartyBlock (boundWitmess: XyoBoundWitness, publicKey: XyoObjectStructure?) throws -> String {
-        let indexOfParty = try XyoHumanName.getIndexForParty(boundWitness: boundWitmess, index: 0)
+    private static func handleSinglePartyBlock (boundWitness: XyoBoundWitness, publicKey: XyoObjectStructure?) throws -> String {
+        let indexOfParty = try XyoHumanName.getIndexForParty(boundWitness: boundWitness, index: 0)
 
         if (indexOfParty == 0) {
             return "Genesis Block!"
@@ -38,17 +38,17 @@ public struct XyoHumanName {
         return "Self signed block"
     }
 
-    private static func handleMultiPartyBlock (boundWitmess: XyoBoundWitness, publicKey: XyoObjectStructure?) throws -> String {
+    private static func handleMultiPartyBlock (boundWitness: XyoBoundWitness, publicKey: XyoObjectStructure?) throws -> String {
         guard let safePublicKey = publicKey else {
             return "Regular Interaction"
         }
 
-        guard let indexOfSelf = try XyoBoundWitnessUtil.getPartyNumberFromPublicKey(publickey: safePublicKey, boundWitness: boundWitmess) else {
+        guard let indexOfSelf = try XyoBoundWitnessUtil.getPartyNumberFromPublicKey(publickey: safePublicKey, boundWitness: boundWitness) else {
             return "Regular Interaction"
         }
 
-        guard let numberOfBlocksSent = try XyoHumanName.getNumberOfBridgeBlocksForParty(boundWitness: boundWitmess, index: indexOfSelf) else {
-            guard let numberOfBlocksRecived = try XyoHumanName.getNumberOfBridgeBlocksForParty(boundWitness: boundWitmess, index: XyoHumanName.getInverse(index: indexOfSelf)) else {
+        guard let numberOfBlocksSent = try XyoHumanName.getNumberOfBridgeBlocksForParty(boundWitness: boundWitness, index: indexOfSelf) else {
+            guard let numberOfBlocksRecived = try XyoHumanName.getNumberOfBridgeBlocksForParty(boundWitness: boundWitness, index: XyoHumanName.getInverse(index: indexOfSelf)) else {
                 return "Regular Interaction"
             }
 

diff --git a/Sources/sdk-xyo-swift/Heuristics/XyoHumanName.swift b/Sources/sdk-xyo-swift/Heuristics/XyoHumanName.swift
@@ -10,26 +10,26 @@ import Foundation
 import sdk_core_swift
 
 public struct XyoHumanName {
-    public static func getHumanName (boundWitmess: XyoBoundWitness, publicKey: XyoObjectStructure?) -> String {
+    public static func getHumanName (boundWitness: XyoBoundWitness, publicKey: XyoObjectStructure?) -> String {
         do {
-            guard let numberOfParties = try boundWitmess.getNumberOfParties() else {
+            guard let numberOfParties = try boundWitness.getNumberOfParties() else {
                 return "Invalid"
             }
 
             if (numberOfParties == 1) {
-                return try XyoHumanName.handleSinglePartyBlock(boundWitmess: boundWitmess, publicKey: publicKey)
+                return try XyoHumanName.handleSinglePartyBlock(boundWitness: boundWitness, publicKey: publicKey)
             }
 
-            return try XyoHumanName.handleMultiPartyBlock(boundWitmess: boundWitmess, publicKey: publicKey)
+            return try XyoHumanName.handleMultiPartyBlock(boundWitness: boundWitness, publicKey: publicKey)
 
         } catch {
             return "Invalid"
         }
 
     }
 
-    private static func handleSinglePartyBlock (boundWitmess: XyoBoundWitness, publicKey: XyoObjectStructure?) throws -> String {
-        let indexOfParty = try XyoHumanName.getIndexForParty(boundWitness: boundWitmess, index: 0)
+    private static func handleSinglePartyBlock (boundWitness: XyoBoundWitness, publicKey: XyoObjectStructure?) throws -> String {
+        let indexOfParty = try XyoHumanName.getIndexForParty(boundWitness: boundWitness, index: 0)
 
         if (indexOfParty == 0) {
             return "Genesis Block!"
@@ -38,17 +38,17 @@ public struct XyoHumanName {
         return "Self signed block"
     }
 
-    private static func handleMultiPartyBlock (boundWitmess: XyoBoundWitness, publicKey: XyoObjectStructure?) throws -> String {
+    private static func handleMultiPartyBlock (boundWitness: XyoBoundWitness, publicKey: XyoObjectStructure?) throws -> String {
         guard let safePublicKey = publicKey else {
             return "Regular Interaction"
         }
 
-        guard let indexOfSelf = try XyoBoundWitnessUtil.getPartyNumberFromPublicKey(publickey: safePublicKey, boundWitness: boundWitmess) else {
+        guard let indexOfSelf = try XyoBoundWitnessUtil.getPartyNumberFromPublicKey(publickey: safePublicKey, boundWitness: boundWitness) else {
             return "Regular Interaction"
         }
 
-        guard let numberOfBlocksSent = try XyoHumanName.getNumberOfBridgeBlocksForParty(boundWitness: boundWitmess, index: indexOfSelf) else {
-            guard let numberOfBlocksRecived = try XyoHumanName.getNumberOfBridgeBlocksForParty(boundWitness: boundWitmess, index: XyoHumanName.getInverse(index: indexOfSelf)) else {
+        guard let numberOfBlocksSent = try XyoHumanName.getNumberOfBridgeBlocksForParty(boundWitness: boundWitness, index: indexOfSelf) else {
+            guard let numberOfBlocksRecived = try XyoHumanName.getNumberOfBridgeBlocksForParty(boundWitness: boundWitness, index: XyoHumanName.getInverse(index: indexOfSelf)) else {
                 return "Regular Interaction"
             }
 

diff --git a/sdk-xyo-swift.podspec b/sdk-xyo-swift.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'sdk-xyo-swift'
-  s.version          = '1.0.11'
+  s.version          = '1.0.12'
   s.summary          = 'An easy to use XYO Platform wrapper for swift developers.'
 
   s.description      = <<-DESC