Skip to content

solve lint check #147

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

Merged
aaronliu01 merged 2 commits into from
Jun 12, 2026
Merged

solve lint check #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e7609e
solve lint check
sgz13140 Jun 12, 2026
a89f4ec
solve lint check
sgz13140 Jun 12, 2026
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
12 changes: 5 additions & 7 deletions helper/call.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ import (
"strings"
"time"

"github.com/ethereum/go-ethereum"

"github.com/maticnetwork/heimdall/tron"

eth "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
ethTypes "github.com/ethereum/go-ethereum/core/types"
Expand All @@ -29,6 +26,7 @@ import (
"github.com/maticnetwork/heimdall/contracts/statereceiver"
"github.com/maticnetwork/heimdall/contracts/statesender"
"github.com/maticnetwork/heimdall/contracts/validatorset"
"github.com/maticnetwork/heimdall/tron"

"github.com/maticnetwork/heimdall/types"
hmTypes "github.com/maticnetwork/heimdall/types"
Expand Down Expand Up @@ -299,13 +297,13 @@ func (c *ContractCaller) GetRootTokenType(rootChainType string, rootChainManager
switch rootChainType {
case hmTypes.RootChainTypeEth:
contractAddress := common.HexToAddress(rootChainManagerProxy)
result, err = c.MainChainClient.CallContract(context.Background(), ethereum.CallMsg{
result, err = c.MainChainClient.CallContract(context.Background(), eth.CallMsg{
To: &contractAddress,
Data: data,
}, nil)
case hmTypes.RootChainTypeBsc:
contractAddress := common.HexToAddress(rootChainManagerProxy)
result, err = c.BscChainClient.CallContract(context.Background(), ethereum.CallMsg{
result, err = c.BscChainClient.CallContract(context.Background(), eth.CallMsg{
To: &contractAddress,
Data: data,
}, nil)
Expand Down Expand Up @@ -516,7 +514,7 @@ func (c *ContractCaller) GetLogs(fromBlock *big.Int, toBlock *big.Int, addrs []c
ctx, cancel := context.WithTimeout(context.Background(), c.MaticChainTimeout)
defer cancel()

logs, err := c.MaticChainClient.FilterLogs(ctx, ethereum.FilterQuery{ //nolint:typecheck
logs, err := c.MaticChainClient.FilterLogs(ctx, eth.FilterQuery{
FromBlock: fromBlock,
ToBlock: toBlock,
Addresses: addrs,
Expand Down
8 changes: 2 additions & 6 deletions helper/state_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ type StateSyncData struct {
// ParseStateSyncData decodes StateSender data encoded as abi.encode(eventType, syncData).
func ParseStateSyncData(data []byte) (*StateSyncData, error) {
stateData, err := parseStateSyncPayload(data)
if err == nil && stateData.EventType != StateSyncEventUnknown {
return stateData, nil
} else if stateData.EventType == StateSyncEventUnknown {
return nil, errors.New("invalid EventType")
} else {
if err != nil {
return nil, err
}

Expand Down Expand Up @@ -84,7 +80,7 @@ func parseStateSyncPayload(data []byte) (*StateSyncData, error) {
case StateSyncMapTokenTypeHash:
return parseMapTokenStateSyncData(syncData)
default:
return &StateSyncData{EventType: StateSyncEventUnknown}, nil
return &StateSyncData{EventType: StateSyncEventUnknown}, errors.New("invalid state sync type")
}
}

Expand Down
Loading