From 9ce02a7010c51cd68fe2f4b43045358c8e6c5035 Mon Sep 17 00:00:00 2001 From: wit liu <765765346@qq.com> Date: Wed, 24 Sep 2025 07:51:10 +0800 Subject: [PATCH] all: fix goimports (#1560) --- contracts/XDCx/simulation/fee/lending/main.go | 2 +- contracts/XDCx/trc21.go | 3 ++- contracts/XDCx/trc21Issuer.go | 3 ++- contracts/blocksigner/blocksigner.go | 3 ++- contracts/trc21issuer/simulation/common.go | 3 ++- contracts/trc21issuer/trc21.go | 3 ++- contracts/trc21issuer/trc21issuer.go | 3 ++- contracts/validator/validator.go | 2 +- core/chain_makers_test.go | 2 +- eth/bft/bft_handler.go | 2 +- tests/vm_test.go | 2 +- 11 files changed, 17 insertions(+), 11 deletions(-) diff --git a/contracts/XDCx/simulation/fee/lending/main.go b/contracts/XDCx/simulation/fee/lending/main.go index 5f495f3b35..4e70c107df 100644 --- a/contracts/XDCx/simulation/fee/lending/main.go +++ b/contracts/XDCx/simulation/fee/lending/main.go @@ -3,7 +3,6 @@ package main import ( "context" "fmt" - "github.com/XinFinOrg/XDPoSChain/contracts/XDCx/simulation" "math/big" "os" "strconv" @@ -12,6 +11,7 @@ import ( "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/contracts/XDCx" + "github.com/XinFinOrg/XDPoSChain/contracts/XDCx/simulation" "github.com/XinFinOrg/XDPoSChain/crypto" "github.com/XinFinOrg/XDPoSChain/ethclient" ) diff --git a/contracts/XDCx/trc21.go b/contracts/XDCx/trc21.go index dc3539b5ea..ca9976e394 100644 --- a/contracts/XDCx/trc21.go +++ b/contracts/XDCx/trc21.go @@ -1,10 +1,11 @@ package XDCx import ( + "math/big" + "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/contracts/XDCx/contract" - "math/big" ) type MyTRC21 struct { diff --git a/contracts/XDCx/trc21Issuer.go b/contracts/XDCx/trc21Issuer.go index d28182d1cc..76710d2cbb 100644 --- a/contracts/XDCx/trc21Issuer.go +++ b/contracts/XDCx/trc21Issuer.go @@ -1,10 +1,11 @@ package XDCx import ( + "math/big" + "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/contracts/XDCx/contract" - "math/big" ) type TRC21Issuer struct { diff --git a/contracts/blocksigner/blocksigner.go b/contracts/blocksigner/blocksigner.go index f3bd3273cc..efc4e0f6ab 100644 --- a/contracts/blocksigner/blocksigner.go +++ b/contracts/blocksigner/blocksigner.go @@ -16,10 +16,11 @@ package blocksigner import ( + "math/big" + "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/contracts/blocksigner/contract" - "math/big" ) type BlockSigner struct { diff --git a/contracts/trc21issuer/simulation/common.go b/contracts/trc21issuer/simulation/common.go index e29ef5b24e..a94974d856 100644 --- a/contracts/trc21issuer/simulation/common.go +++ b/contracts/trc21issuer/simulation/common.go @@ -1,8 +1,9 @@ package simulation import ( - "github.com/XinFinOrg/XDPoSChain/crypto" "math/big" + + "github.com/XinFinOrg/XDPoSChain/crypto" ) var ( diff --git a/contracts/trc21issuer/trc21.go b/contracts/trc21issuer/trc21.go index 3d5f927692..5ea6931f06 100644 --- a/contracts/trc21issuer/trc21.go +++ b/contracts/trc21issuer/trc21.go @@ -1,10 +1,11 @@ package trc21issuer import ( + "math/big" + "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/contracts/trc21issuer/contract" - "math/big" ) type MyTRC21 struct { diff --git a/contracts/trc21issuer/trc21issuer.go b/contracts/trc21issuer/trc21issuer.go index 2ea24fec8d..0b6d6c4c12 100644 --- a/contracts/trc21issuer/trc21issuer.go +++ b/contracts/trc21issuer/trc21issuer.go @@ -1,10 +1,11 @@ package trc21issuer import ( + "math/big" + "github.com/XinFinOrg/XDPoSChain/accounts/abi/bind" "github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/contracts/trc21issuer/contract" - "math/big" ) type TRC21Issuer struct { diff --git a/contracts/validator/validator.go b/contracts/validator/validator.go index 1c3c5969cd..fc82386ce0 100644 --- a/contracts/validator/validator.go +++ b/contracts/validator/validator.go @@ -46,7 +46,7 @@ func NewValidator(transactOpts *bind.TransactOpts, contractAddr common.Address, func DeployValidator(transactOpts *bind.TransactOpts, contractBackend bind.ContractBackend, validatorAddress []common.Address, caps []*big.Int, ownerAddress common.Address, minDeposit *big.Int, minVoterCap *big.Int) (common.Address, *Validator, error) { if minDeposit == nil { minDeposit = new(big.Int) - minDeposit.SetString("10000000", 10) // 10M + minDeposit.SetString("10000000", 10) // 10M minDeposit.Mul(minDeposit, big.NewInt(1e18)) //convert to wei } if minVoterCap == nil { diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index d24cd2ec9e..d419f03b7c 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -18,10 +18,10 @@ package core import ( "fmt" - "github.com/XinFinOrg/XDPoSChain/core/rawdb" "math/big" "github.com/XinFinOrg/XDPoSChain/consensus/ethash" + "github.com/XinFinOrg/XDPoSChain/core/rawdb" "github.com/XinFinOrg/XDPoSChain/core/types" "github.com/XinFinOrg/XDPoSChain/core/vm" "github.com/XinFinOrg/XDPoSChain/crypto" diff --git a/eth/bft/bft_handler.go b/eth/bft/bft_handler.go index 325701bb9c..2286217523 100644 --- a/eth/bft/bft_handler.go +++ b/eth/bft/bft_handler.go @@ -153,7 +153,7 @@ func (b *Bfter) SyncInfo(peer string, syncInfo *types.SyncInfo) error { log.Debug("[SyncInfo] Received SyncInfo", "qcRound", syncInfo.HighestQuorumCert.ProposedBlockInfo.Round, "qcBlocknum", syncInfo.HighestQuorumCert.ProposedBlockInfo.Number, "qcBlockhash", syncInfo.HighestQuorumCert.ProposedBlockInfo.Hash.Hex()) } if syncInfo.HighestTimeoutCert != nil { - log.Debug("[SyncInfo] Received SyncInfo", "tcRound", syncInfo.HighestTimeoutCert.Round) + log.Debug("[SyncInfo] Received SyncInfo", "tcRound", syncInfo.HighestTimeoutCert.Round) } qcBlockNum := syncInfo.HighestQuorumCert.ProposedBlockInfo.Number.Int64() diff --git a/tests/vm_test.go b/tests/vm_test.go index dd8a9da958..819b5742ff 100644 --- a/tests/vm_test.go +++ b/tests/vm_test.go @@ -17,10 +17,10 @@ package tests import ( - "github.com/XinFinOrg/XDPoSChain/common" "math/big" "testing" + "github.com/XinFinOrg/XDPoSChain/common" "github.com/XinFinOrg/XDPoSChain/core/vm" )