Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
c53c4e4
Delete untyped decode methods.
yaroslavyaroslav Apr 28, 2022
e4012bf
Add generic encodeHex methods to `(Un)KeyedEncodingContainer`
yaroslavyaroslav May 3, 2022
d86583b
Update `Encodable+Extensions` to be generic.
yaroslavyaroslav May 10, 2022
24dc3a8
Making memos to methods.
yaroslavyaroslav May 13, 2022
cd751ee
`JSONRPCParam` enum implementation.
yaroslavyaroslav May 14, 2022
fb4c10d
`JSONRPCparams` replaced with `[JSONRPCParameter]` in outgoing API ca…
yaroslavyaroslav May 15, 2022
88c84bb
To create `JSONRPCrequest` parameters should conforms `JSONRPCParamet…
yaroslavyaroslav May 17, 2022
72e7ad9
Move JSONRPCParameter to separate file.
yaroslavyaroslav May 18, 2022
9f79702
Update UInt64 to UInt since this accuracy isn't required.
yaroslavyaroslav May 19, 2022
d7953dc
Change UInt64 to UInt.
yaroslavyaroslav May 22, 2022
e439b04
Remove commented out piece of code
yaroslavyaroslav May 22, 2022
1a7734e
Make Counter.increment() static method mode clear
yaroslavyaroslav May 22, 2022
8398c5d
Fix feeHistory logic bug
yaroslavyaroslav May 22, 2022
8c0e119
Make async/await internal API consistent
yaroslavyaroslav May 22, 2022
dfe4f72
Delete duplicate BlockNumber enum in FeeHistory.
yaroslavyaroslav May 22, 2022
e4fcc1d
Add EthJSONRPC enum to encapsulate REST logic.
yaroslavyaroslav May 23, 2022
f1ab07d
Method `sendRequest<U>(with call: EthJSONRPC) async throws -> EthResp…
yaroslavyaroslav May 24, 2022
9e0343c
Rename request types
yaroslavyaroslav May 24, 2022
5db2272
Implement most of required protocols to make decoding responses to ge…
yaroslavyaroslav May 25, 2022
245cc0d
Make `APIRequestParameterType` internal.
yaroslavyaroslav May 25, 2022
2a54eec
Refactor API a bit.
yaroslavyaroslav May 26, 2022
4e69483
Update for new Network layer:
yaroslavyaroslav May 26, 2022
635009a
Update for network layer:
yaroslavyaroslav May 27, 2022
27a28e2
Update clients code for changes made
yaroslavyaroslav May 27, 2022
351b671
Update for network layer:
yaroslavyaroslav May 27, 2022
7c5126a
Refactor code a bit.
yaroslavyaroslav May 27, 2022
412972b
Update for network layer:
yaroslavyaroslav May 27, 2022
2de0d21
Revert `BigUInt` to `UInt` type changes.
yaroslavyaroslav May 27, 2022
8207727
Rename API calls files and folder
yaroslavyaroslav May 27, 2022
216686e
Encapsulate request methods into APIRequest enum.
yaroslavyaroslav May 31, 2022
dddf1f2
Rename `getTransactionCount(address:, onBlock:)` to `getTransactionCo…
yaroslavyaroslav May 31, 2022
65c5a53
Add TxPool and getLog implementation
yaroslavyaroslav May 31, 2022
b24948f
Temporary disable Websocket provider.
yaroslavyaroslav May 31, 2022
0bc450b
Delete old HTTP(S) network code.
yaroslavyaroslav May 31, 2022
983d084
Temporary comment out not failed to build tests.
yaroslavyaroslav May 31, 2022
bbe64ef
Comment out some duplicating code.
yaroslavyaroslav May 31, 2022
16d6f1c
Delete `Web3+Eth.swift` since its purpose were to make Promise method…
yaroslavyaroslav May 31, 2022
6611999
Rename deleted methods in tests and BrowserFunctions to new one.
yaroslavyaroslav May 31, 2022
fec0bc0
Little code formatting
yaroslavyaroslav Jun 1, 2022
78301bd
Fix wrong sendTransaction request bug.
yaroslavyaroslav Jun 2, 2022
41ac98f
Fix `gasLimit` and `gasPrice` request bug.
yaroslavyaroslav Jun 2, 2022
23ef94a
Add Data type support by conforming `LiteralInitiableFromString` prot…
yaroslavyaroslav Jun 2, 2022
fa80d43
Implement `GetLogs` call.
yaroslavyaroslav Jun 3, 2022
90e2061
Update Web3HTTPProvider
yaroslavyaroslav Jun 5, 2022
55732ab
Delete unused `URLSession.data` method method.
yaroslavyaroslav Jun 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Temporary comment out not failed to build tests.
  • Loading branch information
yaroslavyaroslav committed May 31, 2022
commit 983d084de44072818f19f825e1d298ab4a97f87d
12 changes: 6 additions & 6 deletions Tests/web3swiftTests/localTests/web3swiftTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ class web3swiftTests: XCTestCase {
XCTAssert(ibn == "XE83FUTTUNPK7WZJSGGCWVEBARQWQ8YML4")
}

func testGenericRPCresponse() throws {
let hex = "0x1"
let rpcResponse = JSONRPCresponse(id: 1, jsonrpc: "2.0", result: hex, error: nil)
let value: BigUInt? = rpcResponse.getValue()
XCTAssert(value == 1)
}
// func testGenericRPCresponse() throws {
// let hex = "0x1"
// let rpcResponse = JSONRPCresponse(id: 1, jsonrpc: "2.0", result: hex, error: nil)
// let value: BigUInt? = rpcResponse.getValue()
// XCTAssert(value == 1)
// }

func testPublicMappingsAccess() async throws {
let jsonString = "[{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"users\",\"outputs\":[{\"name\":\"name\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"}],\"name\":\"userDeviceCount\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"totalUsers\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"}]"
Expand Down
2 changes: 1 addition & 1 deletion Tests/web3swiftTests/remoteTests/InfuraTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class InfuraTests: XCTestCase {
filter.toBlock = .blockNumber(UInt(5200120))
filter.addresses = [EthereumAddress("0x53066cddbc0099eb6c96785d9b3df2aaeede5da3")!]
filter.parameterFilters = [([EthereumAddress("0xefdcf2c36f3756ce7247628afdb632fa4ee12ec5")!] as [EventFilterable]), (nil as [EventFilterable]?)]
let eventParserResult = try await contract!.getIndexedEventsPromise(eventName: "Transfer", filter: filter, joinWithReceipts: true)
let eventParserResult = try await contract!.getIndexedEvents(eventName: "Transfer", filter: filter, joinWithReceipts: true)
print(eventParserResult)
XCTAssert(eventParserResult.count == 2)
XCTAssert(eventParserResult.first?.transactionReceipt != nil)
Expand Down
48 changes: 24 additions & 24 deletions Tests/web3swiftTests/remoteTests/WebsocketTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class SpyDelegate: Web3SocketDelegate {
class WebsocketTests: XCTestCase {

let spyDelegate = SpyDelegate()
var socketProvider: InfuraWebsocketProvider?
// var socketProvider: InfuraWebsocketProvider?

// FIXME: Failed on async/await
// func testSocketConnection(){
Expand Down Expand Up @@ -159,27 +159,27 @@ class WebsocketTests: XCTestCase {
// }
// }

func testFilter() {
guard let socketProvider = InfuraWebsocketProvider.connectToInfuraSocket(.Mainnet, delegate: spyDelegate) else {
return XCTFail()
}
self.socketProvider = socketProvider
spyDelegate.asyncExpectation = expectation(description: "Delegate called")
try! self.socketProvider?.setFilterAndGetLogs(method: .newFilter, address: EthereumAddress("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48")!, fromBlock: .earliest, toBlock: .latest, topics: nil)
// DispatchQueue.main.asyncAfter(deadline: .now()+5) { [unowned self] in
// try! self.socketProvider!.subscribeOnNewPendingTransactions()
// }
waitForExpectations(timeout: 1000) { error in
if let error = error {
XCTFail("waitForExpectationsWithTimeout errored: \(error)")
}

guard self.spyDelegate.somethingWithDelegateResult != nil else {
XCTFail("Expected delegate to be called")
return
}

XCTAssert(true)
}
}
// func testFilter() {
// guard let socketProvider = InfuraWebsocketProvider.connectToInfuraSocket(.Mainnet, delegate: spyDelegate) else {
// return XCTFail()
// }
// self.socketProvider = socketProvider
// spyDelegate.asyncExpectation = expectation(description: "Delegate called")
// try! self.socketProvider?.setFilterAndGetLogs(method: .newFilter, address: EthereumAddress("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48")!, fromBlock: .earliest, toBlock: .latest, topics: nil)
// // DispatchQueue.main.asyncAfter(deadline: .now()+5) { [unowned self] in
// // try! self.socketProvider!.subscribeOnNewPendingTransactions()
// // }
// waitForExpectations(timeout: 1000) { error in
// if let error = error {
// XCTFail("waitForExpectationsWithTimeout errored: \(error)")
// }
//
// guard self.spyDelegate.somethingWithDelegateResult != nil else {
// XCTFail("Expected delegate to be called")
// return
// }
//
// XCTAssert(true)
// }
// }
}