Merge pull request #55 from XYOracleNetwork/develop

fix errors from object model refactor
XYOracleNetwork-v1 · Apr 8, 2020 · 991d73e · 991d73e
2 parents 1c8907d + b63b9c6
commit 991d73e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ platform :ios, '11.0'
 use_frameworks!
 
 target '<Your Target Name>' do
-    pod 'sdk-core-swift', '3.1.4'
+    pod 'sdk-core-swift', '3.1.5'
 end
 ```
 

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.4'
+  s.version          = '3.1.5'
   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
@@ -44,7 +44,7 @@ open class XyoBoundWitness : XyoIterableStructure {
     }
 
     internal func getSigningData () throws -> [UInt8] {
-        return try getValueCopy().copyRangeOf(from: 0, toEnd: getWitnessFetterBoundry()).toByteArray()
+        return try getValueCopy().copyRangeOf(from: 0, to: getWitnessFetterBoundry()).toByteArray()
     }
 
     public func getNumberOfParties () throws -> Int? {

diff --git a/sdk-core-swift/crypto/signing/ecdsa/XyoSecp256k1Signer.swift b/sdk-core-swift/crypto/signing/ecdsa/XyoSecp256k1Signer.swift
@@ -63,14 +63,14 @@ public class XyoSecp256k1Signer : XyoSigner {
     private func getRFromD(der : [UInt8]) -> [UInt8] {
         let sizeOfR = Int(der[3])
         let buffer = XyoBuffer(data: der)
-        return buffer.copyRangeOf(from: 3 + 1, toEnd: (3 + sizeOfR) + 1).toByteArray()
+        return buffer.copyRangeOf(from: 3 + 1, to: (3 + sizeOfR) + 1).toByteArray()
     }
 
     private func getSFromD(der : [UInt8]) -> [UInt8] {
         let sizeOfR = Int(der[3])
         let sizeOfS = Int(der[Int(5 + sizeOfR)])
         let buffer = XyoBuffer(data: der)
-        return buffer.copyRangeOf(from: 5 + sizeOfR + 1, toEnd: 6 + sizeOfR + sizeOfS).toByteArray()
+        return buffer.copyRangeOf(from: 5 + sizeOfR + 1, to: 6 + sizeOfR + sizeOfS).toByteArray()
     }
 
     private static func randomData(ofLength length: Int) -> Data {

diff --git a/sdk-core-swift/network/XyoAdvertisePacket.swift b/sdk-core-swift/network/XyoAdvertisePacket.swift
@@ -26,6 +26,6 @@ public struct XyoAdvertisePacket {
             throw XyoObjectError.OUTOFINDEX
         }
 
-        return XyoBuffer(data: data).copyRangeOf(from: 1, toEnd: sizeOfChoice + 1).toByteArray()
+        return XyoBuffer(data: data).copyRangeOf(from: 1, to: sizeOfChoice + 1).toByteArray()
     }
 }
diff --git a/sdk-core-swift/network/XyoChoicePacket.swift b/sdk-core-swift/network/XyoChoicePacket.swift
@@ -26,7 +26,7 @@ public struct XyoChoicePacket {
             throw XyoObjectError.OUTOFINDEX
         }
 
-        return XyoBuffer(data: data).copyRangeOf(from: 1, toEnd: sizeOfChoice + 1).toByteArray()
+        return XyoBuffer(data: data).copyRangeOf(from: 1, to: sizeOfChoice + 1).toByteArray()
     }
 
     func getResponse () throws -> [UInt8] {
@@ -40,7 +40,7 @@ public struct XyoChoicePacket {
             throw XyoObjectError.OUTOFINDEX
         }
 
-        return XyoBuffer(data: data).copyRangeOf(from: sizeOfChoice + 1, toEnd: data.count).toByteArray()
+        return XyoBuffer(data: data).copyRangeOf(from: sizeOfChoice + 1, to: data.count).toByteArray()
     }
 
     private func getSizeOfChoice () -> Int {

diff --git a/sdk-core-swift/objectmodel/XyoObjectErrors.swift b/sdk-core-swift/objectmodel/XyoObjectErrors.swift
@@ -9,11 +9,11 @@
 import Foundation
 
 public enum XyoObjectError: Error {
-    case SIZE_ZERO
-    case NOT_ITERABLE
-    case OUT_OF_INDEX
-    case NOT_UNTYPED
-    case NOT_TYPED
-    case NO_ELEMENTS
-    case WRONG_TYPE
+    case SIZEZERO
+    case NOTITERABLE
+    case OUTOFINDEX
+    case NOTUNTYPED
+    case NOTTYPED
+    case NOELEMENTS
+    case WRONGTYPE
 }