forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-16 18:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core, eth/hooks, internal/ethapi: rename xdc sort package (#1707)

Browse source
This commit is contained in:
Daniel Liu 2025-12-07 18:17:49 +08:00 committed by GitHub
parent 93d453c4c4
commit 1990e73b3c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/blockchain.go
View file

@ -33,7 +33,7 @@ import (
"github.com/XinFinOrg/XDPoSChain/common/lru" "github.com/XinFinOrg/XDPoSChain/common/lru"
"github.com/XinFinOrg/XDPoSChain/common/mclock" "github.com/XinFinOrg/XDPoSChain/common/mclock"
"github.com/XinFinOrg/XDPoSChain/common/prque" "github.com/XinFinOrg/XDPoSChain/common/prque"
"github.com/XinFinOrg/XDPoSChain/common/sort" xdc_sort "github.com/XinFinOrg/XDPoSChain/common/sort"
"github.com/XinFinOrg/XDPoSChain/consensus" "github.com/XinFinOrg/XDPoSChain/consensus"
"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS"
"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils"
@ -2803,7 +2803,7 @@ func (bc *BlockChain) UpdateM1() error {
log.Error("No masternode found. Stopping node") log.Error("No masternode found. Stopping node")
return errors.New("no masternode found") return errors.New("no masternode found")
} else { } else {
sort.Slice(ms, func(i, j int) bool { xdc_sort.Slice(ms, func(i, j int) bool {
return ms[i].Stake.Cmp(ms[j].Stake) >= 0 return ms[i].Stake.Cmp(ms[j].Stake) >= 0
}) })
log.Info("Ordered list of masternode candidates") log.Info("Ordered list of masternode candidates")

4
eth/hooks/engine_v1_hooks.go
View file

@ -8,7 +8,7 @@ import (
"github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind"
"github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/common"
"github.com/XinFinOrg/XDPoSChain/common/sort" xdc_sort "github.com/XinFinOrg/XDPoSChain/common/sort"
"github.com/XinFinOrg/XDPoSChain/consensus" "github.com/XinFinOrg/XDPoSChain/consensus"
"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS"
"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils"
@ -241,7 +241,7 @@ func AttachConsensusV1Hooks(adaptor *XDPoS.XDPoS, bc *core.BlockChain, chainConf
candidates = append(candidates, utils.Masternode{Address: address, Stake: v}) candidates = append(candidates, utils.Masternode{Address: address, Stake: v})
} }
// sort candidates by stake descending // sort candidates by stake descending
sort.Slice(candidates, func(i, j int) bool { xdc_sort.Slice(candidates, func(i, j int) bool {
return candidates[i].Stake.Cmp(candidates[j].Stake) >= 0 return candidates[i].Stake.Cmp(candidates[j].Stake) >= 0
}) })
if len(candidates) > 150 { if len(candidates) > 150 {

6
internal/ethapi/api.go
View file

@ -31,7 +31,7 @@ import (
"github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/common"
"github.com/XinFinOrg/XDPoSChain/common/hexutil" "github.com/XinFinOrg/XDPoSChain/common/hexutil"
math "github.com/XinFinOrg/XDPoSChain/common/math" math "github.com/XinFinOrg/XDPoSChain/common/math"
"github.com/XinFinOrg/XDPoSChain/common/sort" xdc_sort "github.com/XinFinOrg/XDPoSChain/common/sort"
"github.com/XinFinOrg/XDPoSChain/consensus" "github.com/XinFinOrg/XDPoSChain/consensus"
"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS"
"github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils" "github.com/XinFinOrg/XDPoSChain/consensus/XDPoS/utils"
@ -908,7 +908,7 @@ func (api *BlockChainAPI) GetCandidateStatus(ctx context.Context, coinbaseAddres
} }
if len(candidates) > maxMasternodes { if len(candidates) > maxMasternodes {
sort.Slice(candidates, func(i, j int) bool { xdc_sort.Slice(candidates, func(i, j int) bool {
return candidates[i].Stake.Cmp(candidates[j].Stake) > 0 return candidates[i].Stake.Cmp(candidates[j].Stake) > 0
}) })
} }
@ -1068,7 +1068,7 @@ func (api *BlockChainAPI) GetCandidates(ctx context.Context, epoch rpc.EpochNumb
} }
if len(candidates) > maxMasternodes { if len(candidates) > maxMasternodes {
sort.Slice(candidates, func(i, j int) bool { xdc_sort.Slice(candidates, func(i, j int) bool {
return candidates[i].Stake.Cmp(candidates[j].Stake) > 0 return candidates[i].Stake.Cmp(candidates[j].Stake) > 0
}) })
} }