Skip to content

Commit 7ca0f51

Browse files
vietddudevietddude
committed
test: align xrp and stellar metadata assertions after rebase
1 parent d856eb5 commit 7ca0f51

4 files changed

Lines changed: 27 additions & 54 deletions

File tree

‎internal/indexer/stellar_live_test.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,10 @@ func TestStellarMainnetCreateClaimableBalanceIntegration(t *testing.T) {
186186
assert.Equal(t, ledger.Hash, tx.BlockHash)
187187
assert.Equal(t, transferIndex, tx.TransferIndex)
188188

189-
subtype, ok := tx.GetMetadataString(types.MetadataKeySubtype)
190-
require.True(t, ok)
189+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
191190
assert.Equal(t, expectedSubtype, subtype)
192191

193-
claimableID, ok := tx.GetMetadataString(types.MetadataKeyClaimableID)
194-
require.True(t, ok)
192+
claimableID := tx.GetMetadataString(types.MetadataKeyClaimableID)
195193
assert.Equal(t, expectedBalanceID, claimableID)
196194

197195
state, found, err := idx.loadClaimableBalanceState(expectedBalanceID)
@@ -274,12 +272,10 @@ func TestStellarMainnetClaimClaimableBalanceIntegration(t *testing.T) {
274272
assert.Equal(t, ledger.Hash, tx.BlockHash)
275273
assert.Equal(t, transferIndex, tx.TransferIndex)
276274

277-
subtype, ok := tx.GetMetadataString(types.MetadataKeySubtype)
278-
require.True(t, ok)
275+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
279276
assert.Equal(t, expectedSubtype, subtype)
280277

281-
claimableID, ok := tx.GetMetadataString(types.MetadataKeyClaimableID)
282-
require.True(t, ok)
278+
claimableID := tx.GetMetadataString(types.MetadataKeyClaimableID)
283279
assert.Equal(t, expectedBalanceID, claimableID)
284280

285281
_, found, err := idx.loadClaimableBalanceState(expectedBalanceID)

‎internal/indexer/stellar_test.go‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,9 @@ func TestStellarGetBlock_ParsesNativeAndIssuedPaymentsWithMemo(t *testing.T) {
314314
assert.Equal(t, "", nativeTx.AssetAddress)
315315
assert.Equal(t, "LEDGER_HASH", nativeTx.BlockHash)
316316
assert.Equal(t, "pt1", nativeTx.TransferIndex)
317-
memo, ok := nativeTx.GetMetadataString(types.MetadataKeyMemo)
318-
require.True(t, ok)
317+
memo := nativeTx.GetMetadataString(types.MetadataKeyMemo)
319318
assert.Equal(t, "memo-1", memo)
320-
memoType, ok := nativeTx.GetMetadataString(types.MetadataKeyMemoType)
321-
require.True(t, ok)
319+
memoType := nativeTx.GetMetadataString(types.MetadataKeyMemoType)
322320
assert.Equal(t, "text", memoType)
323321
assert.Equal(t, "0.00001", nativeTx.TxFee.String())
324322

@@ -327,8 +325,7 @@ func TestStellarGetBlock_ParsesNativeAndIssuedPaymentsWithMemo(t *testing.T) {
327325
assert.Equal(t, "GISSUER:USDC", tokenTx.AssetAddress)
328326
assert.Equal(t, "LEDGER_HASH", tokenTx.BlockHash)
329327
assert.Equal(t, "pt2", tokenTx.TransferIndex)
330-
memo, ok = tokenTx.GetMetadataString(types.MetadataKeyMemo)
331-
require.True(t, ok)
328+
memo = tokenTx.GetMetadataString(types.MetadataKeyMemo)
332329
assert.Equal(t, "memo-2", memo)
333330
assert.Equal(t, "99.2500000", tokenTx.Amount)
334331

@@ -347,8 +344,7 @@ func TestStellarGetBlock_ParsesNativeAndIssuedPaymentsWithMemo(t *testing.T) {
347344
assert.Equal(t, "GPATHFROM", pathTx.FromAddress)
348345
assert.Equal(t, "GDEST", pathTx.ToAddress)
349346
assert.Equal(t, "7.1250000", pathTx.Amount)
350-
memo, ok = pathTx.GetMetadataString(types.MetadataKeyMemo)
351-
require.True(t, ok)
347+
memo = pathTx.GetMetadataString(types.MetadataKeyMemo)
352348
assert.Equal(t, "memo-3", memo)
353349
assert.Equal(t, "0.00003", pathTx.TxFee.String())
354350
}
@@ -679,8 +675,7 @@ func TestStellarConvertOperation_ClawbackUsesBurnAddress(t *testing.T) {
679675
assert.Equal(t, constant.TxTypeTokenTransfer, tx.Type)
680676
assert.Equal(t, "ledger-hash", tx.BlockHash)
681677
assert.Equal(t, "10", tx.TransferIndex)
682-
subtype, exists := tx.GetMetadataString(types.MetadataKeySubtype)
683-
require.True(t, exists)
678+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
684679
assert.Equal(t, "clawback", subtype)
685680
}
686681

@@ -725,11 +720,9 @@ func TestStellarConvertOperation_CreateClaimableBalancePersistsState(t *testing.
725720
assert.Equal(t, "GISSUER:USDC", tx.AssetAddress)
726721
assert.Equal(t, "11.5000000", tx.Amount)
727722
assert.Equal(t, constant.TxTypeTokenTransfer, tx.Type)
728-
subtype, exists := tx.GetMetadataString(types.MetadataKeySubtype)
729-
require.True(t, exists)
723+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
730724
assert.Equal(t, "create_claimable_balance", subtype)
731-
balanceID, exists := tx.GetMetadataString(types.MetadataKeyClaimableID)
732-
require.True(t, exists)
725+
balanceID := tx.GetMetadataString(types.MetadataKeyClaimableID)
733726
assert.Equal(t, "balance-1", balanceID)
734727

735728
var state stellarClaimableBalanceState

‎internal/indexer/xrp_live_test.go‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,10 @@ func TestXRPMainnetAccountDeleteIntegration(t *testing.T) {
136136
assert.Equal(t, block.Hash, tx.BlockHash)
137137
assert.Equal(t, findXRPLedgerTransactionIndex(t, ledger, txHash), tx.TransferIndex)
138138

139-
subtype, ok := tx.GetMetadataString(types.MetadataKeySubtype)
140-
require.True(t, ok)
139+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
141140
assert.Equal(t, expectedSubtype, subtype)
142141

143-
destinationTag, ok := tx.GetMetadataString(types.MetadataKeyDestinationTag)
144-
require.True(t, ok)
142+
destinationTag := tx.GetMetadataString(types.MetadataKeyDestinationTag)
145143
assert.Equal(t, expectedDestinationTag, destinationTag)
146144
}
147145

@@ -179,12 +177,10 @@ func TestXRPMainnetCheckCashIntegration(t *testing.T) {
179177
assert.Equal(t, block.Hash, tx.BlockHash)
180178
assert.Equal(t, findXRPLedgerTransactionIndex(t, ledger, txHash), tx.TransferIndex)
181179

182-
subtype, ok := tx.GetMetadataString(types.MetadataKeySubtype)
183-
require.True(t, ok)
180+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
184181
assert.Equal(t, expectedSubtype, subtype)
185182

186-
checkID, ok := tx.GetMetadataString(types.MetadataKeyCheckID)
187-
require.True(t, ok)
183+
checkID := tx.GetMetadataString(types.MetadataKeyCheckID)
188184
assert.Equal(t, expectedCheckID, checkID)
189185
}
190186

@@ -223,7 +219,6 @@ func TestXRPMainnetClawbackIntegration(t *testing.T) {
223219
assert.Equal(t, block.Hash, tx.BlockHash)
224220
assert.Equal(t, findXRPLedgerTransactionIndex(t, ledger, txHash), tx.TransferIndex)
225221

226-
subtype, ok := tx.GetMetadataString(types.MetadataKeySubtype)
227-
require.True(t, ok)
222+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
228223
assert.Equal(t, expectedSubtype, subtype)
229224
}

‎internal/indexer/xrp_test.go‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ func TestXRPConvertLedger_ParsesNativeAndIssuedPayments(t *testing.T) {
127127
assert.Equal(t, "", nativeTx.AssetAddress)
128128
assert.Equal(t, "LEDGER_HASH", nativeTx.BlockHash)
129129
assert.Equal(t, "0", nativeTx.TransferIndex)
130-
destinationTagValue, ok := nativeTx.GetMetadataString(types.MetadataKeyDestinationTag)
131-
require.True(t, ok)
130+
destinationTagValue := nativeTx.GetMetadataString(types.MetadataKeyDestinationTag)
132131
assert.Equal(t, "778899", destinationTagValue)
133132
assert.Equal(t, "0.000012", nativeTx.TxFee.String())
134133

@@ -240,11 +239,9 @@ func TestXRPConvertLedger_ParsesAccountDelete(t *testing.T) {
240239
assert.Equal(t, "rDest", tx.ToAddress)
241240
assert.Equal(t, "5", tx.Amount)
242241
assert.Equal(t, constant.TxTypeNativeTransfer, tx.Type)
243-
subtype, ok := tx.GetMetadataString(types.MetadataKeySubtype)
244-
require.True(t, ok)
242+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
245243
assert.Equal(t, "account_delete", subtype)
246-
tag, ok := tx.GetMetadataString(types.MetadataKeyDestinationTag)
247-
require.True(t, ok)
244+
tag := tx.GetMetadataString(types.MetadataKeyDestinationTag)
248245
assert.Equal(t, "42", tag)
249246
}
250247

@@ -304,14 +301,11 @@ func TestXRPConvertLedger_ParsesCheckCashIssuedAsset(t *testing.T) {
304301
assert.Equal(t, "5.20", tx.Amount)
305302
assert.Equal(t, "rIssuer:USD", tx.AssetAddress)
306303
assert.Equal(t, constant.TxTypeTokenTransfer, tx.Type)
307-
subtype, ok := tx.GetMetadataString(types.MetadataKeySubtype)
308-
require.True(t, ok)
304+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
309305
assert.Equal(t, "check_cash", subtype)
310-
checkID, ok := tx.GetMetadataString(types.MetadataKeyCheckID)
311-
require.True(t, ok)
306+
checkID := tx.GetMetadataString(types.MetadataKeyCheckID)
312307
assert.Equal(t, "CHECK1", checkID)
313-
tag, ok := tx.GetMetadataString(types.MetadataKeyDestinationTag)
314-
require.True(t, ok)
308+
tag := tx.GetMetadataString(types.MetadataKeyDestinationTag)
315309
assert.Equal(t, "778899", tag)
316310
}
317311

@@ -367,17 +361,13 @@ func TestXRPConvertLedger_ParsesEscrowFinish(t *testing.T) {
367361
assert.Equal(t, "rDest", tx.ToAddress)
368362
assert.Equal(t, "2.5", tx.Amount)
369363
assert.Equal(t, constant.TxTypeNativeTransfer, tx.Type)
370-
subtype, ok := tx.GetMetadataString(types.MetadataKeySubtype)
371-
require.True(t, ok)
364+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
372365
assert.Equal(t, "escrow_finish", subtype)
373-
escrowOwner, ok := tx.GetMetadataString(types.MetadataKeyEscrowOwner)
374-
require.True(t, ok)
366+
escrowOwner := tx.GetMetadataString(types.MetadataKeyEscrowOwner)
375367
assert.Equal(t, "rOwner", escrowOwner)
376-
escrowSequence, ok := tx.GetMetadataString(types.MetadataKeyEscrowSequence)
377-
require.True(t, ok)
368+
escrowSequence := tx.GetMetadataString(types.MetadataKeyEscrowSequence)
378369
assert.Equal(t, "7", escrowSequence)
379-
tag, ok := tx.GetMetadataString(types.MetadataKeyDestinationTag)
380-
require.True(t, ok)
370+
tag := tx.GetMetadataString(types.MetadataKeyDestinationTag)
381371
assert.Equal(t, "12", tag)
382372
}
383373

@@ -422,8 +412,7 @@ func TestXRPConvertLedger_ParsesClawback(t *testing.T) {
422412
assert.Equal(t, "rIssuer:USD", tx.AssetAddress)
423413
assert.Equal(t, "5.20", tx.Amount)
424414
assert.Equal(t, constant.TxTypeTokenTransfer, tx.Type)
425-
subtype, ok := tx.GetMetadataString(types.MetadataKeySubtype)
426-
require.True(t, ok)
415+
subtype := tx.GetMetadataString(types.MetadataKeySubtype)
427416
assert.Equal(t, "clawback", subtype)
428417
}
429418

0 commit comments

Comments
 (0)