utils refactoring

tesseract-one · Nov 22, 2023 · 2acf8f0 · 2acf8f0
1 parent 00fd2e2
commit 2acf8f0
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 161 deletions.
diff --git a/Sources/TesseractClient/TesseractDelegate.swift b/Sources/TesseractClient/TesseractDelegate.swift
@@ -30,7 +30,6 @@ extension CKeyValue_CString__ClientStatus: CKeyValue, CPtr {
     public typealias CKey = CString
     public typealias CVal = ClientStatus
     public typealias SVal = KeyValue<String, Status>
-    public typealias Val = SVal
 
     public func copied() -> KeyValue<String, Status> {
         KeyValue(key: key.copied(), value: val.copied())
@@ -48,7 +47,6 @@ extension CKeyValue_CString__ClientStatus: CKeyValue, CPtr {
 
 extension ClientTransportsStatusRef: CPtrDictionaryPtrRef {
     public typealias SElement = KeyValue<String, Status>
-    public typealias RefVal = [KeyValue<String, Status>]
     public typealias CElement = CKeyValue_CString__ClientStatus
 }
 

diff --git a/Sources/TesseractShared/Protocols/SubstrateService.swift b/Sources/TesseractShared/Protocols/SubstrateService.swift
@@ -125,7 +125,7 @@ extension SubstrateAccountType: CValue {
 
 extension CFuture_SubstrateGetAccountResponse: CFuturePtr {
     public typealias CVal = CTesseract.SubstrateGetAccountResponse
-    public typealias Val = SubstrateGetAccountResponse
+    public typealias SVal = SubstrateGetAccountResponse
 
     public mutating func _onComplete(cb: @escaping (CResult<CVal>) -> Void) -> CResult<CVal>? {
         _withOnCompleteContext(cb) { ctx, value, error in

diff --git a/Sources/TesseractTransportsClient/CoreTransport.swift b/Sources/TesseractTransportsClient/CoreTransport.swift
@@ -72,7 +72,7 @@ extension Status: AsCPtrCopy {
 
 extension CFutureClientStatus: CFuturePtr {
     public typealias CVal = ClientStatus
-    public typealias Val = Status
+    public typealias SVal = Status
 
     mutating public func _onComplete(cb: @escaping (CResult<CVal>) -> Void) -> CResult<CVal>? {
         _withOnCompleteContext(cb) { ctx, value, error in

diff --git a/Sources/TesseractTransportsShared/TesseractError+Ext.swift b/Sources/TesseractTransportsShared/TesseractError+Ext.swift
@@ -14,7 +14,7 @@ import TesseractUtils
 public typealias TResult<V> = Result<V, TesseractError>
 
 public extension CFuturePtr {
-    init<E: TesseractErrorConvertible>(_ cb: @escaping @Sendable () async -> Result<Val, E>) {
+    init<E: TesseractErrorConvertible>(_ cb: @escaping @Sendable () async -> Result<SVal, E>) {
         self.init { await cb().mapError { $0.tesseract.cError } }
     }
 }

diff --git a/Sources/TesseractUtils/Array.swift b/Sources/TesseractUtils/Array.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public protocol CArrayPtrRef: CType, CPtrRef where RefVal == [SElement] {
+public protocol CArrayPtrRef: CType, CPtrRef where SVal == [SElement] {
     associatedtype CElement
     associatedtype SElement
 
@@ -17,60 +17,51 @@ public protocol CArrayPtrRef: CType, CPtrRef where RefVal == [SElement] {
     var len: UInt { get }
 }
 
-public protocol CArrayPtr: CType, CPtr where Val == [SElement] {
-    associatedtype CElement
-    associatedtype SElement
-
-    init(ptr: UnsafePointer<CElement>!, len: UInt)
-
-    var ptr: UnsafePointer<CElement>! { get set }
-    var len: UInt { get }
-}
+public protocol CArrayPtr: CArrayPtrRef, CPtr {}
 
-extension CArrayPtrRef {
-    public var bufferPtr: UnsafeBufferPointer<CElement> {
-        UnsafeBufferPointer(start: ptr, count: Int(len))
-    }
-}
-
-extension CArrayPtr {
-    public init(buffer: UnsafeBufferPointer<CElement>) {
+public extension CArrayPtrRef {
+    init(buffer: UnsafeBufferPointer<CElement>) {
         self.init(ptr: buffer.baseAddress, len: UInt(buffer.count))
     }
 
-    public init(buffer: UnsafeMutableBufferPointer<CElement>) {
+    init(buffer: UnsafeMutableBufferPointer<CElement>) {
         self.init(ptr: buffer.baseAddress, len: UInt(buffer.count))
     }
 
-    public var bufferPtr: UnsafeBufferPointer<CElement> {
+    var bufferPtr: UnsafeBufferPointer<CElement> {
         UnsafeBufferPointer(start: ptr, count: Int(len))
     }
 }
 
+public extension CArrayPtr {
+    mutating func mutBufferPtr() -> UnsafeMutableBufferPointer<CElement> {
+        UnsafeMutableBufferPointer(start: UnsafeMutablePointer(mutating: ptr),
+                                   count: Int(len))
+    }
+}
+
 extension UnsafeBufferPointer {
-    public func arrayPtr<A: CArrayPtr>() -> A where A.CElement == Element {
+    public func arrayPtr<A: CArrayPtrRef>() -> A where A.CElement == Element {
         A(buffer: self)
     }
 }
 
 extension UnsafeMutableBufferPointer where Element == UInt8 {
-    public func arrayPtr<A: CArrayPtr>() -> A where A.CElement == Element {
+    public func arrayPtr<A: CArrayPtrRef>() -> A where A.CElement == Element {
         A(buffer: self)
     }
 }
 
 public protocol CCopyArrayPtrRef: CArrayPtrRef where CElement == SElement {}
 
 extension CCopyArrayPtrRef {
-    public func copied() -> RefVal { Array(bufferPtr) }
+    public func copied() -> SVal { Array(bufferPtr) }
 }
 
-public protocol CCopyArrayPtr: CArrayPtr where CElement == SElement {}
+public protocol CCopyArrayPtr: CCopyArrayPtrRef, CArrayPtr {}
 
 extension CCopyArrayPtr {
-    public func copied() -> Val { Array(bufferPtr) }
-
-    public mutating func owned() -> Val {
+    public mutating func owned() -> SVal {
         defer { self.free() }
         return self.copied()
     }
@@ -81,21 +72,15 @@ public protocol CCopyConvertArrayPtrRef: CArrayPtrRef {
 }
 
 extension CCopyConvertArrayPtrRef {
-    public func copied() -> RefVal {
+    public func copied() -> SVal {
         bufferPtr.map { Self.convert(element: $0) }
     }
 }
 
-public protocol CCopyConvertArrayPtr: CArrayPtr {
-    static func convert(element: CElement) -> SElement
-}
+public protocol CCopyConvertArrayPtr: CCopyConvertArrayPtrRef, CArrayPtr {}
 
 extension CCopyConvertArrayPtr {
-    public func copied() -> Val {
-        bufferPtr.map { Self.convert(element: $0) }
-    }
-
-    public mutating func owned() -> Val {
+    public mutating func owned() -> SVal {
         defer { self.free() }
         return self.copied()
     }
@@ -110,38 +95,23 @@ extension CValueArrayPtrRef {
     }
 }
 
-public protocol CValueArrayPtr: CCopyConvertArrayPtr
-    where CElement: CValue, SElement == CElement.CVal {}
-
-extension CValueArrayPtr {
-    public static func convert(element: CElement) -> SElement {
-        element.asCValue
-    }
-}
+public protocol CValueArrayPtr: CValueArrayPtrRef, CArrayPtr {}
 
 public protocol CPtrArrayPtrRef: CArrayPtrRef
-    where CElement: CPtr, SElement == CElement.Val {}
+    where CElement: CPtr, SElement == CElement.SVal {}
 
 extension CPtrArrayPtrRef {
-    public func copied() -> RefVal {
+    public func copied() -> SVal {
         bufferPtr.map { $0.copied() }
     }
 }
 
-public protocol CPtrArrayPtr: CArrayPtr
-    where CElement: CPtr, SElement == CElement.Val {}
+public protocol CPtrArrayPtr: CPtrArrayPtrRef, CArrayPtr {}
 
 extension CPtrArrayPtr {
-    public func copied() -> Val {
-        bufferPtr.map { $0.copied() }
-    }
-
-    public mutating func owned() -> Val {
+    public mutating func owned() -> SVal {
         defer { self.free() }
-        let memory = UnsafeMutableBufferPointer(
-            start: UnsafeMutablePointer(mutating: ptr),
-            count: Int(len)
-        )
+        let memory = mutBufferPtr()
         var result = Array<SElement>()
         result.reserveCapacity(memory.count)
         for (indx, var elem) in memory.enumerated() {

diff --git a/Sources/TesseractUtils/Data.swift b/Sources/TesseractUtils/Data.swift
@@ -12,21 +12,21 @@ extension CDataRef: CType {}
 extension CData: CType {}
 
 extension CDataRef: CPtrRef {
-    public typealias Val = Data
+    public typealias SVal = Data
 
-    public func copied() -> Data {
+    public func copied() -> SVal {
         Data(bytes: self.ptr, count: Int(self.len))
     }
 }
 
 extension CData: CPtr {
-    public typealias Val = Data
+    public typealias SVal = Data
 
-    public func copied() -> Data {
+    public func copied() -> SVal {
         Data(bytes: self.ptr, count: Int(self.len))
     }
 
-    public mutating func owned() -> Data {
+    public mutating func owned() -> SVal {
         defer { self.free() }
         return self.copied()
     }
@@ -37,12 +37,22 @@ extension CData: CPtr {
     }
 }
 
-extension CData {
-    public init(buffer: UnsafeBufferPointer<UInt8>) {
+public extension CDataRef {
+    init(buffer: UnsafeBufferPointer<UInt8>) {
         self.init(ptr: buffer.baseAddress, len: UInt(buffer.count))
     }
 
-    public init(buffer: UnsafeMutableBufferPointer<UInt8>) {
+    init(buffer: UnsafeMutableBufferPointer<UInt8>) {
+        self.init(ptr: buffer.baseAddress, len: UInt(buffer.count))
+    }
+}
+
+public extension CData {
+    init(buffer: UnsafeBufferPointer<UInt8>) {
+        self.init(ptr: buffer.baseAddress, len: UInt(buffer.count))
+    }
+
+    init(buffer: UnsafeMutableBufferPointer<UInt8>) {
         self.init(ptr: buffer.baseAddress, len: UInt(buffer.count))
     }
 }
@@ -96,4 +106,3 @@ extension UnsafeMutableBufferPointer where Element == UInt8 {
         CData(buffer: self)
     }
 }
-
diff --git a/Sources/TesseractUtils/Dictionary.swift b/Sources/TesseractUtils/Dictionary.swift
@@ -67,15 +67,7 @@ public extension CDictionaryPtrRef {
     }
 }
 
-public protocol CDictionaryPtr: CArrayPtr
-    where CElement: CKeyValue, SElement == CElement.SVal
-{
-    func copiedDictionary<D: FromKeyValueArray>() -> D
-        where D.TKey == SElement.Key, D.TValue == SElement.Value
-
-    func copiedDictionary<D: FromKeyValueArray>(_ type: D.Type) -> D
-        where D.TKey == SElement.Key, D.TValue == SElement.Value
-
+public protocol CDictionaryPtr: CDictionaryPtrRef, CArrayPtr {
     mutating func ownedDictionary<D: FromKeyValueArray>() -> D
         where D.TKey == SElement.Key, D.TValue == SElement.Value
 
@@ -84,18 +76,6 @@ public protocol CDictionaryPtr: CArrayPtr
 }
 
 public extension CDictionaryPtr {
-    func copiedDictionary<D: FromKeyValueArray>() -> D
-        where D.TKey == SElement.Key, D.TValue == SElement.Value
-    {
-        self.copiedDictionary(D.self)
-    }
-
-    func copiedDictionary<D: FromKeyValueArray>(_ type: D.Type) -> D
-        where D.TKey == SElement.Key, D.TValue == SElement.Value
-    {
-        type.init(kv: self.copied())
-    }
-
     mutating func ownedDictionary<D: FromKeyValueArray>() -> D
         where D.TKey == SElement.Key, D.TValue == SElement.Value
     {