@@ -57,8 +57,8 @@ class EIP1559BlockTests: LocalTestCase {
57
57
( 40_000_000 , 12_965_000 , 39_960_938 , false ) // Lower limit -1
58
58
]
59
59
60
- headerArray. forEach { ( touple : ( parentGasLimit: BigUInt , parentNumber: BigUInt , currentGasLimit: BigUInt , is1559: Bool ) ) in
61
- let parent = Block ( number: touple . parentNumber,
60
+ headerArray. forEach { ( tuple : ( parentGasLimit: BigUInt , parentNumber: BigUInt , currentGasLimit: BigUInt , is1559: Bool ) ) in
61
+ let parent = Block ( number: tuple . parentNumber,
62
62
hash: uselessBlockPart. hash,
63
63
parentHash: uselessBlockPart. parentHash,
64
64
nonce: uselessBlockPart. nonce,
@@ -72,14 +72,14 @@ class EIP1559BlockTests: LocalTestCase {
72
72
totalDifficulty: uselessBlockPart. totalDifficulty,
73
73
extraData: uselessBlockPart. extraData,
74
74
size: uselessBlockPart. size,
75
- gasLimit: touple . parentGasLimit,
76
- gasUsed: touple . parentGasLimit / 2 ,
75
+ gasLimit: tuple . parentGasLimit,
76
+ gasUsed: tuple . parentGasLimit / 2 ,
77
77
baseFeePerGas: Web3 . InitialBaseFee,
78
78
timestamp: uselessBlockPart. timestamp,
79
79
transactions: uselessBlockPart. transactions,
80
80
uncles: uselessBlockPart. uncles)
81
81
82
- let current = Block ( number: touple . parentNumber + 1 ,
82
+ let current = Block ( number: tuple . parentNumber + 1 ,
83
83
hash: uselessBlockPart. hash,
84
84
parentHash: uselessBlockPart. parentHash,
85
85
nonce: uselessBlockPart. nonce,
@@ -93,14 +93,14 @@ class EIP1559BlockTests: LocalTestCase {
93
93
totalDifficulty: uselessBlockPart. totalDifficulty,
94
94
extraData: uselessBlockPart. extraData,
95
95
size: uselessBlockPart. size,
96
- gasLimit: touple . currentGasLimit,
97
- gasUsed: touple . currentGasLimit / 2 ,
96
+ gasLimit: tuple . currentGasLimit,
97
+ gasUsed: tuple . currentGasLimit / 2 ,
98
98
baseFeePerGas: Web3 . InitialBaseFee,
99
99
timestamp: uselessBlockPart. timestamp,
100
100
transactions: uselessBlockPart. transactions,
101
101
uncles: uselessBlockPart. uncles)
102
102
103
- if touple . is1559 {
103
+ if tuple . is1559 {
104
104
XCTAssertTrue ( Web3 . isEip1559Block ( parent: parent, current: current) ,
105
105
" Shoult not fail, got parent: \( parent. gasLimit) , current: \( current. gasLimit) " )
106
106
} else {
@@ -124,8 +124,8 @@ class EIP1559BlockTests: LocalTestCase {
124
124
( Web3 . InitialBaseFee, 12_965_000 , 20000000 , 11000000 , 1012500000 ) // current above target
125
125
]
126
126
127
- headerArray. forEach { ( touple : ( parentBaseFee: BigUInt , parentNumber: BigUInt , parentGasLimit: BigUInt , parentGasUsed: BigUInt , expectedBaseFee: BigUInt ) ) in
128
- let parent = Block ( number: touple . parentNumber,
127
+ headerArray. forEach { ( tuple : ( parentBaseFee: BigUInt , parentNumber: BigUInt , parentGasLimit: BigUInt , parentGasUsed: BigUInt , expectedBaseFee: BigUInt ) ) in
128
+ let parent = Block ( number: tuple . parentNumber,
129
129
hash: uselessBlockPart. hash,
130
130
parentHash: uselessBlockPart. parentHash,
131
131
nonce: uselessBlockPart. nonce,
@@ -139,16 +139,16 @@ class EIP1559BlockTests: LocalTestCase {
139
139
totalDifficulty: uselessBlockPart. totalDifficulty,
140
140
extraData: uselessBlockPart. extraData,
141
141
size: uselessBlockPart. size,
142
- gasLimit: touple . parentGasLimit,
143
- gasUsed: touple . parentGasUsed,
142
+ gasLimit: tuple . parentGasLimit,
143
+ gasUsed: tuple . parentGasUsed,
144
144
baseFeePerGas: Web3 . InitialBaseFee,
145
145
timestamp: uselessBlockPart. timestamp,
146
146
transactions: uselessBlockPart. transactions,
147
147
uncles: uselessBlockPart. uncles)
148
148
149
149
let calculatedBaseFee = Web3 . calcBaseFee ( parent)
150
150
151
- XCTAssertEqual ( calculatedBaseFee, touple . expectedBaseFee, " Base fee calculation fails: should be \( touple . expectedBaseFee) , got: \( String ( describing: calculatedBaseFee) ) " )
151
+ XCTAssertEqual ( calculatedBaseFee, tuple . expectedBaseFee, " Base fee calculation fails: should be \( tuple . expectedBaseFee) , got: \( String ( describing: calculatedBaseFee) ) " )
152
152
}
153
153
}
154
154
}
0 commit comments