Merge pull request #50 from XYOracleNetwork/refactor-tools

change ids
XYOracleNetwork-v1 · Apr 3, 2020 · 9498e0b · 9498e0b
2 parents 161e675 + d1f1974
commit 9498e0b
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 36 deletions.
diff --git a/Sources/sdk-core-swift/boundWitness/XyoBoundWitness.swift b/Sources/sdk-core-swift/boundWitness/XyoBoundWitness.swift
@@ -11,19 +11,19 @@ import Foundation
 open class XyoBoundWitness : XyoIterableStructure {
 
     public func getIsCompleted () throws -> Bool {
-        if try self.get(objectId: XyoSchemas.WITNESS.id).count > 0 {
-            return try self.get(objectId: XyoSchemas.FETTER.id).count == (try self.get(objectId: XyoSchemas.WITNESS.id).count)
+        if try self.get(id: XyoSchemas.WITNESS.id).count > 0 {
+            return try self.get(id: XyoSchemas.FETTER.id).count == (try self.get(id: XyoSchemas.WITNESS.id).count)
         }
 
         return false
     }
 
     public func getNumberOfFetters () throws -> Int {
-        return try self.get(objectId: XyoSchemas.FETTER.id).count
+        return try self.get(id: XyoSchemas.FETTER.id).count
     }
 
     public func getNumberOfWitnesses () throws -> Int {
-        return try self.get(objectId: XyoSchemas.WITNESS.id).count
+        return try self.get(id: XyoSchemas.WITNESS.id).count
     }
 
     public func getHash (hasher : XyoHasher) throws -> XyoObjectStructure {
@@ -48,8 +48,8 @@ open class XyoBoundWitness : XyoIterableStructure {
     }
 
     public func getNumberOfParties () throws -> Int? {
-        let numberOfFetters = try self.get(objectId: XyoSchemas.FETTER.id).count
-        let numberOfWitness = try self.get(objectId: XyoSchemas.WITNESS.id).count
+        let numberOfFetters = try self.get(id: XyoSchemas.FETTER.id).count
+        let numberOfWitness = try self.get(id: XyoSchemas.WITNESS.id).count
 
         if (numberOfFetters == numberOfWitness) {
             return numberOfFetters
@@ -85,7 +85,7 @@ open class XyoBoundWitness : XyoIterableStructure {
     }
 
     private func getWitnessFetterBoundry () throws -> Int {
-        let fetters = try self.get(objectId: XyoSchemas.FETTER.id)
+        let fetters = try self.get(id: XyoSchemas.FETTER.id)
         var offsetIndex = 0
 
         for fetter in fetters {

diff --git a/Sources/sdk-core-swift/boundWitness/XyoBoundWitnessUtil.swift b/Sources/sdk-core-swift/boundWitness/XyoBoundWitnessUtil.swift
@@ -13,8 +13,8 @@ public struct XyoBoundWitnessUtil {
     public static func removeIdFromUnsignedPayload (id: UInt8, boundWitness : XyoIterableStructure) throws -> XyoBoundWitness {
         var newBoundWitnessLedger : [XyoObjectStructure] = []
 
-        let fetters = try boundWitness.get(objectId: XyoSchemas.FETTER.id)
-        let witnesses = try boundWitness.get(objectId: XyoSchemas.WITNESS.id)
+        let fetters = try boundWitness.get(id: XyoSchemas.FETTER.id)
+        let witnesses = try boundWitness.get(id: XyoSchemas.WITNESS.id)
 
         newBoundWitnessLedger.append(contentsOf: fetters)
 
@@ -62,7 +62,7 @@ public struct XyoBoundWitnessUtil {
     }
 
     private static func checkPartyForPublicKey (fetter : XyoIterableStructure, publicKey : XyoObjectStructure) throws -> Bool {
-        for keySet in (try fetter.get(objectId: XyoSchemas.KEY_SET.id)) {
+        for keySet in (try fetter.get(id: XyoSchemas.KEY_SET.id)) {
             guard let typedKeyset = keySet as? XyoIterableStructure else {
                 return false
             }

diff --git a/Sources/sdk-core-swift/boundWitness/XyoZigZagBoundWitness.swift b/Sources/sdk-core-swift/boundWitness/XyoZigZagBoundWitness.swift
@@ -64,8 +64,8 @@ class XyoZigZagBoundWitness : XyoBoundWitness {
 
         try signBoundWitness(payload: unsignedPayload)
 
-        let fetters = try self.get(objectId: XyoSchemas.FETTER.id)
-        let witnesses = try self.get(objectId: XyoSchemas.WITNESS.id)
+        let fetters = try self.get(id: XyoSchemas.FETTER.id)
+        let witnesses = try self.get(id: XyoSchemas.WITNESS.id)
 
         let x = numberOfWitnesses + 1
         let y = fetters.count - 1
@@ -111,7 +111,7 @@ class XyoZigZagBoundWitness : XyoBoundWitness {
     }
 
     private func getNumberOfWitnessesFromTransfer (transfer: XyoIterableStructure?) throws -> Int {
-        return (try transfer?.get(objectId: XyoSchemas.WITNESS.id).count) ?? 0
+        return (try transfer?.get(id: XyoSchemas.WITNESS.id).count) ?? 0
     }
 
     private func addTransfer (transfer : XyoIterableStructure) throws {

diff --git a/Sources/sdk-core-swift/objectmodel/XyoIterableStructure.swift b/Sources/sdk-core-swift/objectmodel/XyoIterableStructure.swift
@@ -44,14 +44,14 @@ open class XyoIterableStructure: XyoObjectStructure {
         throw XyoObjectError.OUTOFINDEX
     }
 
-    public func get (objectId: UInt8) throws -> [XyoObjectStructure] {
+    public func get (id: UInt8) throws -> [XyoObjectStructure] {
         let iterator = try getNewIterator()
         var itemsThatFollowId = [XyoObjectStructure]()
 
         while try iterator.hasNext() {
             let item = try iterator.next()
 
-            if try item.getSchema().id == objectId {
+            if try item.getSchema().id == id {
                 itemsThatFollowId.append(item)
             }
 

diff --git a/Sources/sdk-core-swift/origin/XyoOriginBoundWitnessUtil.swift b/Sources/sdk-core-swift/origin/XyoOriginBoundWitnessUtil.swift
@@ -17,14 +17,14 @@ public struct XyoOriginBoundWitnessUtil {
     /// - Parameter boundWitness:  The bound witness to extract the bridged blocks from.
     /// - Returns: The bridged blocks of the first party that has it, if any.
     public static func getBridgedBlocks (boundWitness : XyoBoundWitness) throws -> XyoIterableStructure? {
-        let witnesses = try boundWitness.get(objectId: XyoSchemas.WITNESS.id)
+        let witnesses = try boundWitness.get(id: XyoSchemas.WITNESS.id)
 
         for witness in witnesses {
             guard let typedWitness = witness as? XyoIterableStructure else {
                 throw XyoError.MUST_BE_FETTER_OR_WITNESS
             }
 
-            let blockset = try typedWitness.get(objectId: XyoSchemas.BRIDGE_BLOCK_SET.id)
+            let blockset = try typedWitness.get(id: XyoSchemas.BRIDGE_BLOCK_SET.id)
 
             for item in blockset {
                 return item as? XyoIterableStructure

diff --git a/sdk-core-swift.podspec b/sdk-core-swift.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'sdk-core-swift'
-  s.version          = '3.1.1'
+  s.version          = '3.1.2'
   s.summary          = 'Core Library for XYO Network in Swift.'
   s.swift_version    = '5.0'
 

diff --git a/sdk-core-swift/boundWitness/XyoBoundWitness.swift b/sdk-core-swift/boundWitness/XyoBoundWitness.swift
@@ -11,19 +11,19 @@ import Foundation
 open class XyoBoundWitness : XyoIterableStructure {
 
     public func getIsCompleted () throws -> Bool {
-        if try self.get(objectId: XyoSchemas.WITNESS.id).count > 0 {
-            return try self.get(objectId: XyoSchemas.FETTER.id).count == (try self.get(objectId: XyoSchemas.WITNESS.id).count)
+        if try self.get(id: XyoSchemas.WITNESS.id).count > 0 {
+            return try self.get(id: XyoSchemas.FETTER.id).count == (try self.get(id: XyoSchemas.WITNESS.id).count)
         }
 
         return false
     }
 
     public func getNumberOfFetters () throws -> Int {
-        return try self.get(objectId: XyoSchemas.FETTER.id).count
+        return try self.get(id: XyoSchemas.FETTER.id).count
     }
 
     public func getNumberOfWitnesses () throws -> Int {
-        return try self.get(objectId: XyoSchemas.WITNESS.id).count
+        return try self.get(id: XyoSchemas.WITNESS.id).count
     }
 
     public func getHash (hasher : XyoHasher) throws -> XyoObjectStructure {
@@ -48,8 +48,8 @@ open class XyoBoundWitness : XyoIterableStructure {
     }
 
     public func getNumberOfParties () throws -> Int? {
-        let numberOfFetters = try self.get(objectId: XyoSchemas.FETTER.id).count
-        let numberOfWitness = try self.get(objectId: XyoSchemas.WITNESS.id).count
+        let numberOfFetters = try self.get(id: XyoSchemas.FETTER.id).count
+        let numberOfWitness = try self.get(id: XyoSchemas.WITNESS.id).count
 
         if (numberOfFetters == numberOfWitness) {
             return numberOfFetters
@@ -85,7 +85,7 @@ open class XyoBoundWitness : XyoIterableStructure {
     }
 
     private func getWitnessFetterBoundry () throws -> Int {
-        let fetters = try self.get(objectId: XyoSchemas.FETTER.id)
+        let fetters = try self.get(id: XyoSchemas.FETTER.id)
         var offsetIndex = 0
 
         for fetter in fetters {

diff --git a/sdk-core-swift/boundWitness/XyoBoundWitnessUtil.swift b/sdk-core-swift/boundWitness/XyoBoundWitnessUtil.swift
@@ -13,8 +13,8 @@ public struct XyoBoundWitnessUtil {
     public static func removeIdFromUnsignedPayload (id: UInt8, boundWitness : XyoIterableStructure) throws -> XyoBoundWitness {
         var newBoundWitnessLedger : [XyoObjectStructure] = []
 
-        let fetters = try boundWitness.get(objectId: XyoSchemas.FETTER.id)
-        let witnesses = try boundWitness.get(objectId: XyoSchemas.WITNESS.id)
+        let fetters = try boundWitness.get(id: XyoSchemas.FETTER.id)
+        let witnesses = try boundWitness.get(id: XyoSchemas.WITNESS.id)
 
         newBoundWitnessLedger.append(contentsOf: fetters)
 
@@ -62,7 +62,7 @@ public struct XyoBoundWitnessUtil {
     }
 
     private static func checkPartyForPublicKey (fetter : XyoIterableStructure, publicKey : XyoObjectStructure) throws -> Bool {
-        for keySet in (try fetter.get(objectId: XyoSchemas.KEY_SET.id)) {
+        for keySet in (try fetter.get(id: XyoSchemas.KEY_SET.id)) {
             guard let typedKeyset = keySet as? XyoIterableStructure else {
                 return false
             }

diff --git a/sdk-core-swift/boundWitness/XyoZigZagBoundWitness.swift b/sdk-core-swift/boundWitness/XyoZigZagBoundWitness.swift
@@ -64,8 +64,8 @@ class XyoZigZagBoundWitness : XyoBoundWitness {
 
         try signBoundWitness(payload: unsignedPayload)
 
-        let fetters = try self.get(objectId: XyoSchemas.FETTER.id)
-        let witnesses = try self.get(objectId: XyoSchemas.WITNESS.id)
+        let fetters = try self.get(id: XyoSchemas.FETTER.id)
+        let witnesses = try self.get(id: XyoSchemas.WITNESS.id)
 
         let x = numberOfWitnesses + 1
         let y = fetters.count - 1
@@ -111,7 +111,7 @@ class XyoZigZagBoundWitness : XyoBoundWitness {
     }
 
     private func getNumberOfWitnessesFromTransfer (transfer: XyoIterableStructure?) throws -> Int {
-        return (try transfer?.get(objectId: XyoSchemas.WITNESS.id).count) ?? 0
+        return (try transfer?.get(id: XyoSchemas.WITNESS.id).count) ?? 0
     }
 
     private func addTransfer (transfer : XyoIterableStructure) throws {

diff --git a/sdk-core-swift/objectmodel/XyoIterableStructure.swift b/sdk-core-swift/objectmodel/XyoIterableStructure.swift
@@ -44,14 +44,14 @@ open class XyoIterableStructure: XyoObjectStructure {
         throw XyoObjectError.OUTOFINDEX
     }
 
-    public func get (objectId: UInt8) throws -> [XyoObjectStructure] {
+    public func get (id: UInt8) throws -> [XyoObjectStructure] {
         let iterator = try getNewIterator()
         var itemsThatFollowId = [XyoObjectStructure]()
 
         while try iterator.hasNext() {
             let item = try iterator.next()
 
-            if try item.getSchema().id == objectId {
+            if try item.getSchema().id == id {
                 itemsThatFollowId.append(item)
             }
 

diff --git a/sdk-core-swift/origin/XyoOriginBoundWitnessUtil.swift b/sdk-core-swift/origin/XyoOriginBoundWitnessUtil.swift
@@ -17,14 +17,14 @@ public struct XyoOriginBoundWitnessUtil {
     /// - Parameter boundWitness:  The bound witness to extract the bridged blocks from.
     /// - Returns: The bridged blocks of the first party that has it, if any.
     public static func getBridgedBlocks (boundWitness : XyoBoundWitness) throws -> XyoIterableStructure? {
-        let witnesses = try boundWitness.get(objectId: XyoSchemas.WITNESS.id)
+        let witnesses = try boundWitness.get(id: XyoSchemas.WITNESS.id)
 
         for witness in witnesses {
             guard let typedWitness = witness as? XyoIterableStructure else {
                 throw XyoError.MUST_BE_FETTER_OR_WITNESS
             }
 
-            let blockset = try typedWitness.get(objectId: XyoSchemas.BRIDGE_BLOCK_SET.id)
+            let blockset = try typedWitness.get(id: XyoSchemas.BRIDGE_BLOCK_SET.id)
 
             for item in blockset {
                 return item as? XyoIterableStructure

diff --git a/sdk-core-swiftTests/boundWitness/XyoBoundWitnessUtilTest.swift b/sdk-core-swiftTests/boundWitness/XyoBoundWitnessUtilTest.swift
@@ -17,7 +17,7 @@ class XyoBoundWitnessUtilTest: XCTestCase {
         let rawBoundWitness = "600201A22015CB2019C8000C41170F9302323929FD3FD8A72851F73866A0BFC6D488040E9D921689E01B9E25E4393B0984576763DD9C5DA95E609A80B4CC12064758C1AEEE28AE264015BF474F000D8200AEB335766EC511499DDE566579B4ED1562079AA543388B2EDED68ED68363AE9DAE25E7E29B9A5607E676A5F50CC6EB5CBCEBDEE30FB3F1CB9DA0074D4D3CA29B8BFD42AEEE44CA7C26134F4401FF67332C549AD72B36FBF9211D07B0B825C137D6A0DD13EE35FE446B55D22E66CE751216DC4BB823A3A62C3D0208CAC0DF68AB2017D1201ACA00094421009A0FF234B98891EE3FF99365A3CA6AB804173F1A8619934134A68F59FBDCA92E200C04A196D4A39C987C984E18B79D3EE81667DD92E962E6C630DB5D7BDCDB1988000A81713AB83E5D8B4EF6D2EAB4D70B61AADCA01E733CB0B3D072DE307CDBCD09F46D528A7159EB73DEBB018871E30D182F5BBB426689E758A7BFD4C51D0AD116CA621BF1C39DA49A837D525905D22BAB7C1874F6C7E6B4D56139A15C3BE1D1DC8E061C241C060A24B588217E37D6206AFE5D71F4698D42E25C4FCE996EECCF7690B900130200".hexStringToBytes()
         let boundWitness = XyoBoundWitness(value: XyoBuffer(data: rawBoundWitness))
         let removedRssiBoundWitness = try XyoBoundWitnessUtil.removeIdFromUnsignedPayload(id: XyoSchemas.RSSI.id, boundWitness: boundWitness)
-        let witnesses = try removedRssiBoundWitness.get(objectId: XyoSchemas.WITNESS.id)
+        let witnesses = try removedRssiBoundWitness.get(id: XyoSchemas.WITNESS.id)
 
         for witness in witnesses {
             guard let typedWitness = witness as? XyoIterableStructure else {