Skip to content

N
nebula
Commit 18f6d631 authored by Ethen Pociask's avatar Ethen Pociask
Browse files
Options

[indexer.api.add_withdrawal_hash] better code comments and variable naming

parent da7fb497
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
indexer/api-ts/generated.ts
View file @ 18f6d631
...@@ -38,8 +38,8 @@ export interface WithdrawalItem { ...@@ -38,8 +38,8 @@ export interface WithdrawalItem {
timestamp: number /* uint64 */; timestamp: number /* uint64 */;
l2BlockHash: string; l2BlockHash: string;
amount: string; amount: string;
proofTransactionHash: string; L1ProvenTxHash: string;
claimTransactionHash: string; L1FinalizedTxHash: string;
l1TokenAddress: string; l1TokenAddress: string;
l2TokenAddress: string; l2TokenAddress: string;
} }
......
indexer/api/api_test.go
View file @ 18f6d631
...@@ -149,8 +149,8 @@ func TestL2BridgeWithdrawalsByAddressHandler(t *testing.T) { ...@@ -149,8 +149,8 @@ func TestL2BridgeWithdrawalsByAddressHandler(t *testing.T) {
assert.Equal(t, resp.Items[0].To, withdrawal.Tx.ToAddress.String()) assert.Equal(t, resp.Items[0].To, withdrawal.Tx.ToAddress.String())
assert.Equal(t, resp.Items[0].TransactionHash, common.HexToHash("0x789").String()) assert.Equal(t, resp.Items[0].TransactionHash, common.HexToHash("0x789").String())
assert.Equal(t, resp.Items[0].Amount, withdrawal.Tx.Amount.String()) assert.Equal(t, resp.Items[0].Amount, withdrawal.Tx.Amount.String())
assert.Equal(t, resp.Items[0].ProofTransactionHash, common.HexToHash("0x123").String()) assert.Equal(t, resp.Items[0].L1ProvenTxHash, common.HexToHash("0x123").String())
assert.Equal(t, resp.Items[0].ClaimTransactionHash, common.HexToHash("0x123").String()) assert.Equal(t, resp.Items[0].L1FinalizedTxHash, common.HexToHash("0x123").String())
assert.Equal(t, resp.Items[0].L1TokenAddress, withdrawal.TokenPair.RemoteTokenAddress.String()) assert.Equal(t, resp.Items[0].L1TokenAddress, withdrawal.TokenPair.RemoteTokenAddress.String())
assert.Equal(t, resp.Items[0].L2TokenAddress, withdrawal.TokenPair.LocalTokenAddress.String()) assert.Equal(t, resp.Items[0].L2TokenAddress, withdrawal.TokenPair.LocalTokenAddress.String())
assert.Equal(t, resp.Items[0].Timestamp, withdrawal.Tx.Timestamp) assert.Equal(t, resp.Items[0].Timestamp, withdrawal.Tx.Timestamp)
......
indexer/api/models/models.go
View file @ 18f6d631
...@@ -28,18 +28,18 @@ type DepositResponse struct { ...@@ -28,18 +28,18 @@ type DepositResponse struct {
// WithdrawalItem ... Data model for API JSON response // WithdrawalItem ... Data model for API JSON response
type WithdrawalItem struct { type WithdrawalItem struct {
Guid string `json:"guid"` Guid string `json:"guid"`
From string `json:"from"` From string `json:"from"`
To string `json:"to"` To string `json:"to"`
TransactionHash string `json:"transactionHash"` TransactionHash string `json:"transactionHash"`
MessageHash string `json:"messageHash"` CrossDomainMessageHash string `json:"crossDomainMessageHash"`
Timestamp uint64 `json:"timestamp"` Timestamp uint64 `json:"timestamp"`
L2BlockHash string `json:"l2BlockHash"` L2BlockHash string `json:"l2BlockHash"`
Amount string `json:"amount"` Amount string `json:"amount"`
ProofTransactionHash string `json:"proofTransactionHash"` L1ProvenTxHash string `json:"L1ProvenTxHash"`
ClaimTransactionHash string `json:"claimTransactionHash"` L1FinalizedTxHash string `json:"L1FinalizedTxHash"`
L1TokenAddress string `json:"l1TokenAddress"` L1TokenAddress string `json:"l1TokenAddress"`
L2TokenAddress string `json:"l2TokenAddress"` L2TokenAddress string `json:"l2TokenAddress"`
} }
// WithdrawalResponse ... Data model for API JSON response // WithdrawalResponse ... Data model for API JSON response
...@@ -55,24 +55,24 @@ func CreateWithdrawalResponse(withdrawals *database.L2BridgeWithdrawalsResponse) ...@@ -55,24 +55,24 @@ func CreateWithdrawalResponse(withdrawals *database.L2BridgeWithdrawalsResponse)
items := make([]WithdrawalItem, len(withdrawals.Withdrawals)) items := make([]WithdrawalItem, len(withdrawals.Withdrawals))
for i, withdrawal := range withdrawals.Withdrawals { for i, withdrawal := range withdrawals.Withdrawals {
msg := withdrawal.L2BridgeWithdrawal.CrossDomainMessageHash cdh := withdrawal.L2BridgeWithdrawal.CrossDomainMessageHash
if msg == nil { if cdh == nil { // Zero value indicates that the withdrawal didn't have a cross domain message
msg = &common.Hash{} cdh = &common.Hash{0}
} }
item := WithdrawalItem{ item := WithdrawalItem{
Guid: withdrawal.L2BridgeWithdrawal.TransactionWithdrawalHash.String(), Guid: withdrawal.L2BridgeWithdrawal.TransactionWithdrawalHash.String(),
L2BlockHash: withdrawal.L2BlockHash.String(), L2BlockHash: withdrawal.L2BlockHash.String(),
Timestamp: withdrawal.L2BridgeWithdrawal.Tx.Timestamp, Timestamp: withdrawal.L2BridgeWithdrawal.Tx.Timestamp,
From: withdrawal.L2BridgeWithdrawal.Tx.FromAddress.String(), From: withdrawal.L2BridgeWithdrawal.Tx.FromAddress.String(),
To: withdrawal.L2BridgeWithdrawal.Tx.ToAddress.String(), To: withdrawal.L2BridgeWithdrawal.Tx.ToAddress.String(),
TransactionHash: withdrawal.L2TransactionHash.String(), TransactionHash: withdrawal.L2TransactionHash.String(),
Amount: withdrawal.L2BridgeWithdrawal.Tx.Amount.String(), Amount: withdrawal.L2BridgeWithdrawal.Tx.Amount.String(),
MessageHash: msg.String(), CrossDomainMessageHash: cdh.String(),
ProofTransactionHash: withdrawal.ProvenL1TransactionHash.String(), L1ProvenTxHash: withdrawal.ProvenL1TransactionHash.String(),
ClaimTransactionHash: withdrawal.FinalizedL1TransactionHash.String(), L1FinalizedTxHash: withdrawal.FinalizedL1TransactionHash.String(),
L1TokenAddress: withdrawal.L2BridgeWithdrawal.TokenPair.RemoteTokenAddress.String(), L1TokenAddress: withdrawal.L2BridgeWithdrawal.TokenPair.RemoteTokenAddress.String(),
L2TokenAddress: withdrawal.L2BridgeWithdrawal.TokenPair.LocalTokenAddress.String(), L2TokenAddress: withdrawal.L2BridgeWithdrawal.TokenPair.LocalTokenAddress.String(),
} }
items[i] = item items[i] = item
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment