Skip to content

Commit 61f9497

Browse files
committed
refactor(api): transaction gas_limit -> gas
We should be consistent across all transaction types with the name for this variable. I just picked one, based on the RPC name.
1 parent 32b03c0 commit 61f9497

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

ethportal-api/src/types/execution/transaction.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ pub struct AccessListTransaction {
149149
pub chain_id: U256,
150150
pub nonce: U256,
151151
pub gas_price: U256,
152-
pub gas_limit: U256,
152+
pub gas: U256,
153153
pub to: ToAddress,
154154
pub value: U256,
155155
pub data: Bytes,
@@ -165,8 +165,7 @@ struct AccessListTransactionHelper {
165165
pub chain_id: U256,
166166
pub nonce: U256,
167167
pub gas_price: U256,
168-
#[serde(rename(deserialize = "gas"))]
169-
pub gas_limit: U256,
168+
pub gas: U256,
170169
pub to: ToAddress,
171170
pub value: U256,
172171
#[serde(rename(deserialize = "input"))]
@@ -185,7 +184,7 @@ impl Into<AccessListTransaction> for AccessListTransactionHelper {
185184
chain_id: self.chain_id,
186185
nonce: self.nonce,
187186
gas_price: self.gas_price,
188-
gas_limit: self.gas_limit,
187+
gas: self.gas,
189188
to: self.to,
190189
value: self.value,
191190
data: self.data.0,
@@ -205,7 +204,7 @@ pub struct EIP1559Transaction {
205204
pub nonce: U256,
206205
pub max_priority_fee_per_gas: U256,
207206
pub max_fee_per_gas: U256,
208-
pub gas_limit: U256,
207+
pub gas: U256,
209208
pub to: ToAddress,
210209
pub value: U256,
211210
pub data: Bytes,
@@ -222,8 +221,7 @@ struct EIP1559TransactionHelper {
222221
pub nonce: U256,
223222
pub max_priority_fee_per_gas: U256,
224223
pub max_fee_per_gas: U256,
225-
#[serde(rename(deserialize = "gas"))]
226-
pub gas_limit: U256,
224+
pub gas: U256,
227225
pub to: ToAddress,
228226
pub value: U256,
229227
#[serde(rename(deserialize = "input"))]
@@ -243,7 +241,7 @@ impl Into<EIP1559Transaction> for EIP1559TransactionHelper {
243241
nonce: self.nonce,
244242
max_priority_fee_per_gas: self.max_priority_fee_per_gas,
245243
max_fee_per_gas: self.max_fee_per_gas,
246-
gas_limit: self.gas_limit,
244+
gas: self.gas,
247245
to: self.to,
248246
value: self.value,
249247
data: self.data.0,

0 commit comments

Comments
 (0)