Skip to content
This repository has been archived by the owner on Aug 30, 2022. It is now read-only.

Commit

Permalink
Merge pull request #106 from EOSIO/move-models
Browse files Browse the repository at this point in the history 
Moves RPC Response models under EosioRpcProvider folder
  • Loading branch information
@rahmanifarid
rahmanifarid committed Apr 12, 2019
2 parents 5ad54df + 738f580 commit 52750f1
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 108 deletions.
38 changes: 17 additions & 21 deletions EosioSwift.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
6B80D26921FA6DDF00716A7B /* EosioSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B80D25F21FA6DDF00716A7B /* EosioSwift.framework */; };
6B80D26E21FA6DDF00716A7B /* EosioSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B80D26D21FA6DDF00716A7B /* EosioSwiftTests.swift */; };
6B80D27021FA6DDF00716A7B /* EosioSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B80D26221FA6DDF00716A7B /* EosioSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
8F49E8CF225E6E6A00082631 /* RequestModelsForAdditionalEndpoints.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F49E8CE225E6E6A00082631 /* RequestModelsForAdditionalEndpoints.swift */; };
8F49E8D2225F913000082631 /* ResponseModelsForAdditionalEndpoints.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F49E8D1225F913000082631 /* ResponseModelsForAdditionalEndpoints.swift */; };
8F49E8CF225E6E6A00082631 /* RpcProviderRequestModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F49E8CE225E6E6A00082631 /* RpcProviderRequestModels.swift */; };
8F6B04B522287A5300215CD0 /* EosioError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F6B04B022287A5300215CD0 /* EosioError.swift */; };
8F6B04B622287A5300215CD0 /* EosioSwiftFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8F6B04B122287A5300215CD0 /* EosioSwiftFoundation.h */; };
8F6B04B722287A5300215CD0 /* EosioResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F6B04B222287A5300215CD0 /* EosioResult.swift */; };
Expand All @@ -43,7 +42,7 @@
B466F0962229DA870082DC4E /* EosioSerializationProviderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B466F0952229DA870082DC4E /* EosioSerializationProviderProtocol.swift */; };
B4892C6D221E0CAA0050FA72 /* RequestModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4892C6C221E0CAA0050FA72 /* RequestModels.swift */; };
B49EE519221CCA0900018D29 /* EosioRpcProviderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49EE518221CCA0900018D29 /* EosioRpcProviderProtocol.swift */; };
B4A80E29221F15F200C5134D /* ResponseModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4A80E28221F15F200C5134D /* ResponseModels.swift */; };
B4A80E29221F15F200C5134D /* RpcProviderResponseModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4A80E28221F15F200C5134D /* RpcProviderResponseModels.swift */; };
B4B69EBF2204B65E009260A5 /* EosioSignatureProviderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4B69EBE2204B65E009260A5 /* EosioSignatureProviderProtocol.swift */; };
B4E8F6BC2232020100FA7E63 /* RIPEMD160.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4E8F6BB2232020100FA7E63 /* RIPEMD160.swift */; };
B4E8F6BE22320AC700FA7E63 /* Base58String.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4E8F6BD22320AC700FA7E63 /* Base58String.swift */; };
Expand Down Expand Up @@ -84,8 +83,7 @@
6B80D26821FA6DDF00716A7B /* EosioSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EosioSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6B80D26D21FA6DDF00716A7B /* EosioSwiftTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EosioSwiftTests.swift; sourceTree = "<group>"; };
6B80D26F21FA6DDF00716A7B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8F49E8CE225E6E6A00082631 /* RequestModelsForAdditionalEndpoints.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestModelsForAdditionalEndpoints.swift; sourceTree = "<group>"; };
8F49E8D1225F913000082631 /* ResponseModelsForAdditionalEndpoints.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseModelsForAdditionalEndpoints.swift; sourceTree = "<group>"; };
8F49E8CE225E6E6A00082631 /* RpcProviderRequestModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RpcProviderRequestModels.swift; sourceTree = "<group>"; };
8F6B04B022287A5300215CD0 /* EosioError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EosioError.swift; sourceTree = "<group>"; };
8F6B04B122287A5300215CD0 /* EosioSwiftFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EosioSwiftFoundation.h; sourceTree = "<group>"; };
8F6B04B222287A5300215CD0 /* EosioResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EosioResult.swift; sourceTree = "<group>"; };
Expand All @@ -107,7 +105,7 @@
B466F0952229DA870082DC4E /* EosioSerializationProviderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EosioSerializationProviderProtocol.swift; sourceTree = "<group>"; };
B4892C6C221E0CAA0050FA72 /* RequestModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequestModels.swift; sourceTree = "<group>"; };
B49EE518221CCA0900018D29 /* EosioRpcProviderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EosioRpcProviderProtocol.swift; sourceTree = "<group>"; };
B4A80E28221F15F200C5134D /* ResponseModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseModels.swift; sourceTree = "<group>"; };
B4A80E28221F15F200C5134D /* RpcProviderResponseModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RpcProviderResponseModels.swift; sourceTree = "<group>"; };
B4B69EBE2204B65E009260A5 /* EosioSignatureProviderProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EosioSignatureProviderProtocol.swift; sourceTree = "<group>"; };
B4E8F6BB2232020100FA7E63 /* RIPEMD160.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RIPEMD160.swift; sourceTree = "<group>"; };
B4E8F6BD22320AC700FA7E63 /* Base58String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Base58String.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -236,11 +234,19 @@
path = EosioSwiftTests;
sourceTree = "<group>";
};
8F039890226116B400E8C7CB /* RequestModels */ = {
isa = PBXGroup;
children = (
B4892C6C221E0CAA0050FA72 /* RequestModels.swift */,
);
path = RequestModels;
sourceTree = "<group>";
};
8F49E8D0225E6E7A00082631 /* Models */ = {
isa = PBXGroup;
children = (
8F49E8CE225E6E6A00082631 /* RequestModelsForAdditionalEndpoints.swift */,
8F49E8D1225F913000082631 /* ResponseModelsForAdditionalEndpoints.swift */,
B4A80E28221F15F200C5134D /* RpcProviderResponseModels.swift */,
8F49E8CE225E6E6A00082631 /* RpcProviderRequestModels.swift */,
);
path = Models;
sourceTree = "<group>";
Expand Down Expand Up @@ -279,20 +285,11 @@
path = EosioSerializationProviderProtocol;
sourceTree = "<group>";
};
B4892BF9221DC3AA0050FA72 /* Models */ = {
isa = PBXGroup;
children = (
B4892C6C221E0CAA0050FA72 /* RequestModels.swift */,
B4A80E28221F15F200C5134D /* ResponseModels.swift */,
);
path = Models;
sourceTree = "<group>";
};
B49EE50D221CC63700018D29 /* EosioRpcProviderProtocol */ = {
isa = PBXGroup;
children = (
8F039890226116B400E8C7CB /* RequestModels */,
8FD1C4C72257EADE005AE506 /* AllResponseProtocols.swift */,
B4892BF9221DC3AA0050FA72 /* Models */,
B49EE518221CCA0900018D29 /* EosioRpcProviderProtocol.swift */,
);
path = EosioRpcProviderProtocol;
Expand Down Expand Up @@ -538,18 +535,17 @@
28DDAB08223598DA008FB1CC /* EosioKeySignatureExtensions.swift in Sources */,
8F6B04C422287A9E00215CD0 /* DateExtensions.swift in Sources */,
8F6B04C122287A9E00215CD0 /* StringExtensions.swift in Sources */,
8F49E8CF225E6E6A00082631 /* RequestModelsForAdditionalEndpoints.swift in Sources */,
8F49E8CF225E6E6A00082631 /* RpcProviderRequestModels.swift in Sources */,
2856028F22182EFA00642377 /* EosioTransactionAbis.swift in Sources */,
B4E8F6BC2232020100FA7E63 /* RIPEMD160.swift in Sources */,
8F49E8D2225F913000082631 /* ResponseModelsForAdditionalEndpoints.swift in Sources */,
8F6B04B822287A5300215CD0 /* EosioName.swift in Sources */,
B466F0962229DA870082DC4E /* EosioSerializationProviderProtocol.swift in Sources */,
8F6B04B922287A5300215CD0 /* ZAssert.swift in Sources */,
8F6B04C622287A9E00215CD0 /* ArrayExtensions.swift in Sources */,
28FE03982209D44700CCC977 /* EosioTransaction.swift in Sources */,
B4E8F6BE22320AC700FA7E63 /* Base58String.swift in Sources */,
8FC41FEF225561D3006A76FF /* EosioRpcProvider.swift in Sources */,
B4A80E29221F15F200C5134D /* ResponseModels.swift in Sources */,
B4A80E29221F15F200C5134D /* RpcProviderResponseModels.swift in Sources */,
8F6B04B722287A5300215CD0 /* EosioResult.swift in Sources */,
8FD1C4C82257EADE005AE506 /* AllResponseProtocols.swift in Sources */,
B4892C6D221E0CAA0050FA72 /* RequestModels.swift in Sources */,
Expand Down
32 changes: 0 additions & 32 deletions EosioSwift/EosioRpcProvider/Models/ResponseModelsForAdditionalEndpoints.swift
View file

This file was deleted.

0 ...RequestModelsForAdditionalEndpoints.swift → ...der/Models/RpcProviderRequestModels.swift
View file
File renamed without changes.
78 changes: 23 additions & 55 deletions ...viderProtocol/Models/ResponseModels.swift → ...er/Models/RpcProviderResponseModels.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,61 +60,6 @@ public struct EosioRpcInfoResponse: EosioRpcInfoResponseProtocol, EosioRpcRespon
}
}

public struct EosioRpcTrxResponse: EosioRpcResponseProtocol, Codable {
public var _rawResponse: Any?
public var id: String
public var signatures: [String]
public var compression: String
public var packedContextFreeData: String
public var contextFreeData: [String]
public var packedTrx: String
public var transaction: EosioRpcTransactionResponse

enum CodingKeys: String, CodingKey {
case id
case signatures
case compression
case packedContextFreeData = "packed_context_free_data"
case contextFreeData = "context_free_data"
case packedTrx = "packed_trx"
case transaction
}

public init(id: String, signatures: [String], compression: String, packedContextFreeData: String,
contextFreeData: [String], packedTrx: String, transaction: EosioRpcTransactionResponse) {
self.id = id
self.signatures = signatures
self.compression = compression
self.packedContextFreeData = packedContextFreeData
self.contextFreeData = contextFreeData
self.packedTrx = packedTrx
self.transaction = transaction

}
}

public struct EosioRpcTransactionInfoResponse: EosioRpcResponseProtocol, Codable {
public var _rawResponse: Any?
public let status: String
public let cpuUsageUs: UInt
public let netUsageWords: UInt
public let trx: EosioRpcTrxResponse

enum CodingKeys: String, CodingKey {
case status
case cpuUsageUs = "cpu_usage_us"
case netUsageWords = "net_usage_words"
case trx
}

public init(status: String, cpuUsageUs: UInt, netUsageWords: UInt, trx: EosioRpcTrxResponse) {
self.status = status
self.cpuUsageUs = cpuUsageUs
self.netUsageWords = netUsageWords
self.trx = trx
}
}

public struct EosioRpcBlockResponse: EosioRpcBlockResponseProtocol, EosioRpcResponseProtocol, Codable {
public var _rawResponse: Any?
public let timestamp: String
Expand Down Expand Up @@ -215,3 +160,26 @@ public struct EosioRpcTransactionResponse: EosioRpcTransactionResponseProtocol,
self.transactionId = transactionId
}
}

public struct RawResponse: Codable, EosioRpcResponseProtocol {
public var _rawResponse: Any?

enum CodingKeys: CodingKey {
}
}

public typealias EosioRpcAccountResponse = RawResponse
public typealias EosioRpcCurrencyBalanceResponse = RawResponse
public typealias EosioRpcCurrencyStatsResponse = RawResponse
public typealias EosioRpcRawCodeAndAbiResponse = RawResponse
public typealias EosioRpcCodeResponse = RawResponse
public typealias EosioRpcTableRowsResponse = RawResponse
public typealias EosioRpcTableByScopeResponse = RawResponse
public typealias EosioRpcProducersResponse = RawResponse
public typealias EosioRpcControlledAccountsResponse = RawResponse
public typealias EosioRpcGetTransactionResponse = RawResponse
public typealias EosioRpcKeyAccountsResponse = RawResponse
public typealias EosioRpcActionsResponse = RawResponse
public typealias EosioRpcPushTransactionsResponse = RawResponse
public typealias EosioRpcBlockHeaderStateResponse = RawResponse
public typealias EosioRpcAbiResponse = RawResponse
0 ...oviderProtocol/Models/RequestModels.swift → ...rotocol/RequestModels/RequestModels.swift
View file
File renamed without changes.

0 comments on commit 52750f1

Please sign in to comment.