Skip to content

Commit 517eaaf

Browse files
Fix tests.
1 parent 56e7eec commit 517eaaf

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

Tests/web3swiftTests/localTests/EIP1559Tests.swift renamed to Tests/web3swiftTests/localTests/EIP1559BlockTests.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ import BigInt
44
@testable
55
import web3swift
66

7-
class EIP1559Tests: XCTestCase {
8-
let web3 = Web3()
9-
7+
class EIP1559BlockTests: XCTestCase {
108
let uselessBlockPart = (
119
number: BigUInt(12_965_000),
1210
hash: Data(from: "0xef95f2f1ed3ca60b048b4bf67cde2195961e0bba6f70bcbea9a2c4e133e34b46")!, // "hash":
@@ -100,10 +98,10 @@ class EIP1559Tests: XCTestCase {
10098
uncles: uselessBlockPart.uncles)
10199

102100
if touple.is1559 {
103-
XCTAssertTrue(web3.isEip1559Block(parent: parent, current: current),
101+
XCTAssertTrue(Web3.isEip1559Block(parent: parent, current: current),
104102
"Shoult not fail, got parent: \(parent.gasLimit), current: \(current.gasLimit)")
105103
} else {
106-
XCTAssertFalse(web3.isEip1559Block(parent: parent, current: current),
104+
XCTAssertFalse(Web3.isEip1559Block(parent: parent, current: current),
107105
"Should fail, got parent: \(parent.gasLimit), current: \(current.gasLimit)")
108106
}
109107
}
@@ -145,7 +143,7 @@ class EIP1559Tests: XCTestCase {
145143
transactions: uselessBlockPart.transactions,
146144
uncles: uselessBlockPart.uncles)
147145

148-
let calculatedBaseFee = web3.calcBaseFee(parent)
146+
let calculatedBaseFee = Web3.calcBaseFee(parent)
149147

150148
XCTAssertEqual(calculatedBaseFee, touple.expectedBaseFee, "Base fee calculation fails: should be \(touple.expectedBaseFee), got: \(calculatedBaseFee)")
151149
}

web3swift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
4E2DFEF425485B53001AF561 /* KeystoreParams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E2DFEF325485B53001AF561 /* KeystoreParams.swift */; };
169169
5C03EAB4274405D20052C66D /* EIP712.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB50A52927060C5300D7E39B /* EIP712.swift */; };
170170
5C26D89E27F3724600431EB0 /* Web3+EIP1559.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C26D89D27F3724600431EB0 /* Web3+EIP1559.swift */; };
171-
5C26D8A027F3725500431EB0 /* EIP1559Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C26D89F27F3725500431EB0 /* EIP1559Tests.swift */; };
171+
5C26D8A027F3725500431EB0 /* EIP1559BlockTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C26D89F27F3725500431EB0 /* EIP1559BlockTests.swift */; };
172172
5C26D8A227F5AC0300431EB0 /* Web3+GasOracle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C26D8A127F5AC0300431EB0 /* Web3+GasOracle.swift */; };
173173
5CF7E8A2276B79290009900F /* web3swiftEIP681Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF7E891276B79270009900F /* web3swiftEIP681Tests.swift */; };
174174
5CF7E8A3276B792A0009900F /* web3swiftPersonalSignatureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CF7E892276B79270009900F /* web3swiftPersonalSignatureTests.swift */; };
@@ -384,7 +384,7 @@
384384
3AEF4ABE22C0B6BE00AC7929 /* Web3+Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+Constants.swift"; sourceTree = "<group>"; };
385385
4E2DFEF325485B53001AF561 /* KeystoreParams.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeystoreParams.swift; sourceTree = "<group>"; };
386386
5C26D89D27F3724600431EB0 /* Web3+EIP1559.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Web3+EIP1559.swift"; sourceTree = "<group>"; };
387-
5C26D89F27F3725500431EB0 /* EIP1559Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP1559Tests.swift; sourceTree = "<group>"; };
387+
5C26D89F27F3725500431EB0 /* EIP1559BlockTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP1559BlockTests.swift; sourceTree = "<group>"; };
388388
5C26D8A127F5AC0300431EB0 /* Web3+GasOracle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+GasOracle.swift"; sourceTree = "<group>"; };
389389
5CDEF972275A74590004A2F2 /* web3swift.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = web3swift.xctestplan; path = Tests/web3swiftTests/web3swift.xctestplan; sourceTree = SOURCE_ROOT; };
390390
5CDEF973275A74670004A2F2 /* LocalTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = LocalTests.xctestplan; sourceTree = "<group>"; };
@@ -988,7 +988,7 @@
988988
E252E68126B542D000717C16 /* localTests */ = {
989989
isa = PBXGroup;
990990
children = (
991-
5C26D89F27F3725500431EB0 /* EIP1559Tests.swift */,
991+
5C26D89F27F3725500431EB0 /* EIP1559BlockTests.swift */,
992992
5CF7E8A0276B79290009900F /* web3swiftAdvancedABIv2Tests.swift */,
993993
5CF7E89C276B79280009900F /* web3swiftBasicLocalNodeTests.swift */,
994994
5CF7E8A1276B79290009900F /* web3swiftEIP67Tests.swift */,
@@ -1382,7 +1382,7 @@
13821382
files = (
13831383
5CF7E8AB276B792A0009900F /* web3swiftTests.swift in Sources */,
13841384
5CF7E8A4276B792A0009900F /* web3swiftTransactionsTests.swift in Sources */,
1385-
5C26D8A027F3725500431EB0 /* EIP1559Tests.swift in Sources */,
1385+
5C26D8A027F3725500431EB0 /* EIP1559BlockTests.swift in Sources */,
13861386
5CF7E8A7276B792A0009900F /* web3swiftRLPTests.swift in Sources */,
13871387
5CF7E8AF276B792A0009900F /* web3swiftUserCases.swift in Sources */,
13881388
5CF7E8B0276B792A0009900F /* web3swiftEventloopTests.swift in Sources */,

0 commit comments

Comments
 (0)