From 6271ef52262e0d87801004c68d5935b987ebeddb Mon Sep 17 00:00:00 2001 From: kyanokashi <71283892+kyanokashi@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:34:38 -0400 Subject: [PATCH] fix(vald): extend type API to reduce underlying ambiguity (#2190) --- vald/evm/evm.go | 2 +- vald/evm/rpc/client.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/vald/evm/evm.go b/vald/evm/evm.go index 65b3b8bf7d..f5816f8111 100644 --- a/vald/evm/evm.go +++ b/vald/evm/evm.go @@ -140,7 +140,7 @@ func (mgr Mgr) GetTxReceiptsIfFinalized(chain nexus.ChainName, txIDs []common.Ha } return slices.Map(receipts, func(receipt rpc.TxReceiptResult) results.Result[geth.Receipt] { - return results.Pipe(results.Result[geth.Receipt](receipt), func(receipt geth.Receipt) results.Result[geth.Receipt] { + return results.Pipe(receipt.AsResult(), func(receipt geth.Receipt) results.Result[geth.Receipt] { isFinalized, err := mgr.isFinalized(chain, receipt, confHeight) if err != nil { diff --git a/vald/evm/rpc/client.go b/vald/evm/rpc/client.go index acdd014508..72b57806ce 100644 --- a/vald/evm/rpc/client.go +++ b/vald/evm/rpc/client.go @@ -18,6 +18,11 @@ import ( // results.TxReceiptResult with *types.Receipt. type TxReceiptResult results.Result[types.Receipt] +// AsResult returns the TxReceiptResult as the underlying type results.Result[types.Receipt] +func (r TxReceiptResult) AsResult() results.Result[types.Receipt] { + return results.Result[types.Receipt](r) +} + // Client provides calls to EVM JSON-RPC endpoints type Client interface { // TransactionReceipts returns transaction receipts for the given transaction hashes