code cleanup

tesseract-one · Jun 27, 2023 · dfbd1d0 · dfbd1d0
1 parent aa7c455
commit dfbd1d0
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 35 deletions.
diff --git a/Package.swift b/Package.swift
@@ -31,7 +31,6 @@ var package = Package(
             dependencies: [
                 .product(name: "Serializable", package: "Serializable.swift"),
                 .product(name: "JsonRPC", package: "JsonRPC.swift"),
-                .product(name: "JsonRPCSerializable", package: "JsonRPC.swift"),
                 .product(name: "ScaleCodec", package: "swift-scale-codec"),
                 .product(name: "Blake2", package: "Blake2.swift"),
                 "xxHash-Swift"

diff --git a/Sources/Substrate/Extrinsic/ExtrinsicApi.swift b/Sources/Substrate/Extrinsic/ExtrinsicApi.swift
@@ -6,12 +6,6 @@
 //
 
 import Foundation
-import ScaleCodec
-import JsonRPC
-import Serializable
-#if !COCOAPODS
-import JsonRPCSerializable
-#endif
 
 public protocol ExtrinsicApi<S> {
     associatedtype S: SomeSubstrate

diff --git a/Sources/Substrate/RPC/JsonRPC+Substrate.swift b/Sources/Substrate/RPC/JsonRPC+Substrate.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 import JsonRPC
+@_exported import func JsonRPC.Params
 
 extension JSONEncoder {
     public static var substrate: JSONEncoder = {

diff --git a/Sources/Substrate/RPC/JsonRpcClient.swift b/Sources/Substrate/RPC/JsonRpcClient.swift
@@ -8,9 +8,6 @@
 import Foundation
 import JsonRPC
 import Serializable
-#if !COCOAPODS
-import JsonRPCSerializable
-#endif
 
 public class JsonRpcCallableClient: RpcCallableClient, RuntimeHolder {
     public private (set) var client: JsonRPC.Client & ContentCodersProvider
@@ -30,7 +27,7 @@ public class JsonRpcCallableClient: RpcCallableClient, RuntimeHolder {
     public func call<Params: Encodable, Res: Decodable>(
         method: String, params: Params
     ) async throws -> Res {
-        try await client.call(method: method, params: params)
+        try await client.call(method: method, params: params, SerializableValue.self)
     }
 
     public var runtime: any Runtime {
@@ -132,7 +129,7 @@ public class JsonRpcSubscribableClient: JsonRpcCallableClient, NotificationDeleg
     public func subscribe<P, E>(
         method: String, params: P, unsubsribe umethod: String
     ) async throws -> AsyncThrowingStream<E, Swift.Error> where P : Encodable, E : Decodable {
-        let subscriptionId: String = try await client.call(method: method, params: params)
+        let subscriptionId: String = try await client.call(method: method, params: params, SerializableValue.self)
         return AsyncThrowingStream { continuation in
             let unsubscribe = { [weak self] in
                 guard let this = self else { return }
@@ -208,7 +205,7 @@ public class JsonRpcSubscribableClient: JsonRpcCallableClient, NotificationDeleg
 
     private func unsubscribe(id: String, method: String) async throws {
         try await self.subscriptions.remove(id: id)
-        let result: Bool = try await self.client.call(method: method, params: Params(id))
+        let result: Bool = try await self.client.call(method: method, params: Params(id), SerializableValue.self)
         if !result { throw Error.unsubscribeFailed }
     }
 

diff --git a/Sources/Substrate/RPC/RpcApi.swift b/Sources/Substrate/RPC/RpcApi.swift
@@ -6,12 +6,6 @@
 //
 
 import Foundation
-import ScaleCodec
-import JsonRPC
-import Serializable
-#if !COCOAPODS
-import JsonRPCSerializable
-#endif
 
 public protocol RpcApi<S> {
     associatedtype S: SomeSubstrate

diff --git a/Sources/Substrate/Runtime/Types+RuntimeCodable.swift b/Sources/Substrate/Runtime/Types+RuntimeCodable.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import ScaleCodec
-import Serializable
 
 extension Bool: RuntimeCodable {}
 extension Data: RuntimeCodable {}

diff --git a/Sources/Substrate/RuntimeCall/RuntimeCallApi.swift b/Sources/Substrate/RuntimeCall/RuntimeCallApi.swift
@@ -6,12 +6,6 @@
 //
 
 import Foundation
-import ScaleCodec
-import JsonRPC
-import Serializable
-#if !COCOAPODS
-import JsonRPCSerializable
-#endif
 
 public protocol RuntimeCallApi<S> {
     associatedtype S: SomeSubstrate

diff --git a/Sources/Substrate/Storage/StorageApi.swift b/Sources/Substrate/Storage/StorageApi.swift
@@ -6,12 +6,6 @@
 //
 
 import Foundation
-import ScaleCodec
-import JsonRPC
-import Serializable
-#if !COCOAPODS
-import JsonRPCSerializable
-#endif
 
 public protocol StorageApi<S> {
     associatedtype S: SomeSubstrate

diff --git a/Sources/Substrate/Substrate.swift b/Sources/Substrate/Substrate.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import JsonRPC
 
 public protocol SomeSubstrate<RC>: AnyObject {
     associatedtype RC: Config

diff --git a/Sources/Substrate/Utils/LazyProperty.swift b/Sources/Substrate/Utils/LazyProperty.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import JsonRPC
 
 public struct LazyProperty<Value> {
     private let _value: Synced<Either<() -> Value, Value>>

diff --git a/Tests/SubstrateTests/SubstrateTests.swift b/Tests/SubstrateTests/SubstrateTests.swift
@@ -7,7 +7,6 @@
 
 import XCTest
 import ScaleCodec
-import JsonRPC
 @testable import Substrate
 
 final class SubstrateTests: XCTestCase {