Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Reuse v6 starknet_getTransactionByHash handler for v7 #2486

Merged
merged 9 commits into from
Mar 6, 2025
Merged

refactor: Reuse v6 starknet_getTransactionByHash handler for v7 #2486

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
630fb6d
fix: Distinguish between ErrTxnHashNotFound and ErrInternal
hudem1 Feb 14, 2025
c32e012
fix: Fix test
hudem1 Feb 14, 2025
7190da9
Merge branch 'main' into hudem1/rpc-cleanup-getTransactionByHash
hudem1 Feb 17, 2025
651b7be
Refactor: Reuse v6 handler for v7
hudem1 Feb 17, 2025
df42ccc
make format
hudem1 Feb 17, 2025
abd3b2a
fix(rpcv7): Un-export adaptV6TxToV7 function
hudem1 Feb 26, 2025
b1ccc4f
Merge branch 'main' into hudem1/rpc-cleanup-getTransactionByHash
hudem1 Feb 26, 2025
0b7fb5b
Merge branch 'main' into hudem1/rpc-cleanup-getTransactionByHash
hudem1 Mar 4, 2025
c1d66a0
test: Add tests for coverage
hudem1 Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions rpc/v6/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"github.com/NethermindEth/juno/clients/gateway"
"github.com/NethermindEth/juno/core"
"github.com/NethermindEth/juno/core/felt"
"github.com/NethermindEth/juno/db"
"github.com/NethermindEth/juno/jsonrpc"
rpccore "github.com/NethermindEth/juno/rpc/rpccore"
"github.com/NethermindEth/juno/starknet"
Expand Down Expand Up @@ -427,6 +428,10 @@
func (h *Handler) TransactionByHash(hash felt.Felt) (*Transaction, *jsonrpc.Error) {
txn, err := h.bcReader.TransactionByHash(&hash)
if err != nil {
if !errors.Is(err, db.ErrKeyNotFound) {
return nil, rpccore.ErrInternal.CloneWithData(err)
}

Check warning on line 433 in rpc/v6/transaction.go

View check run for this annotation

Codecov / codecov/patch

rpc/v6/transaction.go#L432-L433 

Added lines #L432 - L433 were not covered by tests

return nil, rpccore.ErrTxnHashNotFound
}
return AdaptTransaction(txn), nil
Expand Down
2 changes: 1 addition & 1 deletion rpc/v6/transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestTransactionByHashNotFound(t *testing.T) {

n := utils.Ptr(utils.Mainnet)
txHash := new(felt.Felt).SetBytes([]byte("random hash"))
mockReader.EXPECT().TransactionByHash(txHash).Return(nil, errors.New("tx not found"))
mockReader.EXPECT().TransactionByHash(txHash).Return(nil, db.ErrKeyNotFound)

handler := rpc.New(mockReader, nil, nil, "", n, nil)

Expand Down
Loading