From d6b136ed7cf5f0a6993b93d02c03a2452ab5078f Mon Sep 17 00:00:00 2001 From: JukLee0ira Date: Fri, 7 Feb 2025 13:59:07 +0800 Subject: [PATCH] consensus, internal, contracts: remove extra hash and string conversions (#830) * consensus, internal: remove extra hash conversions * contracts: remove extra string conversions --- consensus/XDPoS/engines/engine_v2/forensics.go | 2 +- consensus/tests/engine_v2_tests/mine_test.go | 2 +- contracts/utils_test.go | 2 +- internal/ethapi/api.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/consensus/XDPoS/engines/engine_v2/forensics.go b/consensus/XDPoS/engines/engine_v2/forensics.go index adec35cfd1..e94415f619 100644 --- a/consensus/XDPoS/engines/engine_v2/forensics.go +++ b/consensus/XDPoS/engines/engine_v2/forensics.go @@ -353,7 +353,7 @@ func (f *Forensics) FindAncestorBlockHash(chain consensus.ChainReader, firstBloc } // Now, they are on the same starting line, we try find the common ancestor - for lowerBlockNumHash.Hex() != higherBlockNumberHash.Hex() { + for lowerBlockNumHash != higherBlockNumberHash { lowerBlockNumHash = chain.GetHeaderByHash(lowerBlockNumHash).ParentHash higherBlockNumberHash = chain.GetHeaderByHash(higherBlockNumberHash).ParentHash // Append the path diff --git a/consensus/tests/engine_v2_tests/mine_test.go b/consensus/tests/engine_v2_tests/mine_test.go index 9ce5957b12..7a66536eaf 100644 --- a/consensus/tests/engine_v2_tests/mine_test.go +++ b/consensus/tests/engine_v2_tests/mine_test.go @@ -56,7 +56,7 @@ func TestYourTurnInitialV2(t *testing.T) { assert.NotNil(t, snap) masterNodes := adaptor.EngineV1.GetMasternodesFromCheckpointHeader(block900.Header()) for i := 0; i < len(masterNodes); i++ { - assert.Equal(t, masterNodes[i].Hex(), snap.NextEpochCandidates[i].Hex()) + assert.Equal(t, masterNodes[i], snap.NextEpochCandidates[i]) } } diff --git a/contracts/utils_test.go b/contracts/utils_test.go index c30409ceb8..b05fccd0ea 100644 --- a/contracts/utils_test.go +++ b/contracts/utils_test.go @@ -106,7 +106,7 @@ func TestSendTxSign(t *testing.T) { t.Fatalf("Can't get signers: %v", err) } - if signers[0].String() != oldBlocks[blockHash].String() { + if signers[0] != oldBlocks[blockHash] { t.Errorf("Tx sign for block signer not match %v - %v", signers[0].String(), oldBlocks[blockHash].String()) } diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index ed89e50a75..a8d360a23e 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -248,7 +248,7 @@ func (s *PublicTxPoolAPI) Inspect() map[string]map[string]map[string]string { // Define a formatter to flatten a transaction into a string var format = func(tx *types.Transaction) string { if to := tx.To(); to != nil { - return fmt.Sprintf("%s: %v wei + %v gas × %v wei", tx.To().Hex(), tx.Value(), tx.Gas(), tx.GasPrice()) + return fmt.Sprintf("%s: %v wei + %v gas × %v wei", to, tx.Value(), tx.Gas(), tx.GasPrice()) } return fmt.Sprintf("contract creation: %v wei + %v gas × %v wei", tx.Value(), tx.Gas(), tx.GasPrice()) }