From 5957c085f763aaec6a0efc96a4145733ab7973ba Mon Sep 17 00:00:00 2001 From: Oleg Nikonychev Date: Fri, 27 Sep 2024 21:20:46 +0400 Subject: [PATCH] chore: cleanup --- CHANGELOG.md | 1 + eth/rpc/rpcapi/filter_utils.go | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57d38bc11..596d96a80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -122,6 +122,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [#2039](https://github.com/NibiruChain/nibiru/pull/2039) - refactor(rpc-backend): remove unnecessary interface code - [#2044](https://github.com/NibiruChain/nibiru/pull/2044) - feat(evm): evm tx indexer service implemented - [#2045](https://github.com/NibiruChain/nibiru/pull/2045) - test(evm): backend tests with test network and real txs +- [#2053](https://github.com/NibiruChain/nibiru/pull/2053) - refactor(evm): converted untyped event to typed and cleaned up #### Dapp modules: perp, spot, oracle, etc diff --git a/eth/rpc/rpcapi/filter_utils.go b/eth/rpc/rpcapi/filter_utils.go index 78f9c205e..41983b84d 100644 --- a/eth/rpc/rpcapi/filter_utils.go +++ b/eth/rpc/rpcapi/filter_utils.go @@ -6,8 +6,6 @@ import ( "cosmossdk.io/errors" abci "github.com/cometbft/cometbft/abci/types" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/ethereum/go-ethereum/common" gethcore "github.com/ethereum/go-ethereum/core/types" @@ -122,17 +120,11 @@ func ParseBloomFromEvents(events []abci.Event) (bloom gethcore.Bloom, err error) if event.Type != bloomEventType { continue } - typedProtoEvent, err := sdk.ParseTypedEvent(event) + bloomTypedEvent, err := evm.EventBlockBloomFromABCIEvent(event) if err != nil { return bloom, errors.Wrapf( err, "failed to parse event of type %s", bloomEventType) } - bloomTypedEvent, ok := (typedProtoEvent).(*evm.EventBlockBloom) - if !ok { - return bloom, errors.Wrapf( - err, "failed to parse event of type %s", bloomEventType) - } - return eth.BloomFromHex(bloomTypedEvent.Bloom) } return bloom, err