From 3dd627403eb7dfe39a0ed8a2451803e6b60221ee Mon Sep 17 00:00:00 2001 From: 317787106 <317787106@qq.com> Date: Fri, 23 Oct 2026 21:27:21 +0800 Subject: [PATCH] fix 3 test cases --- .../org/tron/core/db/AccountIdIndexStoreTest.java | 11 ++++++----- .../messagehandler/TransactionsMsgHandlerTest.java | 2 ++ .../org/tron/core/net/services/RelayServiceTest.java | 5 +++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java b/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java index 4c70bbcdb8a..0313d5cb121 100644 --- a/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java +++ b/framework/src/test/java/org/tron/core/db/AccountIdIndexStoreTest.java @@ -25,11 +25,12 @@ public class AccountIdIndexStoreTest extends BaseTest { private static final byte[] ACCOUNT_ADDRESS_TWO = randomBytes(16); private static final byte[] ACCOUNT_ADDRESS_THREE = randomBytes(16); private static final byte[] ACCOUNT_ADDRESS_FOUR = randomBytes(16); - private static final byte[] ACCOUNT_NAME_ONE = randomBytes(6); - private static final byte[] ACCOUNT_NAME_TWO = randomBytes(6); - private static final byte[] ACCOUNT_NAME_THREE = randomBytes(6); - private static final byte[] ACCOUNT_NAME_FOUR = randomBytes(6); - private static final byte[] ACCOUNT_NAME_FIVE = randomBytes(6); + // Random bytes can collide after UTF-8 decoding and case normalization of account IDs. + private static final byte[] ACCOUNT_NAME_ONE = "account1".getBytes(StandardCharsets.UTF_8); + private static final byte[] ACCOUNT_NAME_TWO = "account2".getBytes(StandardCharsets.UTF_8); + private static final byte[] ACCOUNT_NAME_THREE = "account3".getBytes(StandardCharsets.UTF_8); + private static final byte[] ACCOUNT_NAME_FOUR = "account4".getBytes(StandardCharsets.UTF_8); + private static final byte[] ACCOUNT_NAME_FIVE = "account5".getBytes(StandardCharsets.UTF_8); private static final Locale TURKISH = Locale.forLanguageTag("tr"); @Resource private AccountIdIndexStore accountIdIndexStore; diff --git a/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java b/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java index 44e13ba8210..9ec8589597e 100644 --- a/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java +++ b/framework/src/test/java/org/tron/core/net/messagehandler/TransactionsMsgHandlerTest.java @@ -49,6 +49,7 @@ import org.tron.core.net.peer.Item; import org.tron.core.net.peer.PeerConnection; import org.tron.core.net.service.adv.AdvService; +import org.tron.core.net.service.fetchblock.FetchBlockService; import org.tron.core.net.service.sync.SyncService; import org.tron.p2p.connection.Channel; import org.tron.protos.Protocol; @@ -591,6 +592,7 @@ private void assertDisconnectRecovery(boolean announced, boolean busy) throws Ex List activePeers = new ArrayList<>(Collections.singletonList(source)); Mockito.when(delegate.getActivePeer()).thenReturn(activePeers); ReflectUtils.setFieldValue(adv, "tronNetDelegate", delegate); + ReflectUtils.setFieldValue(adv, "fetchBlockService", Mockito.mock(FetchBlockService.class)); setField(handler, "tronNetDelegate", delegate); setField(handler, "advService", adv); setField(handler, "chainBaseManager", Mockito.mock(ChainBaseManager.class)); diff --git a/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java b/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java index 6a9c07010c9..d5c0bfbcdf6 100644 --- a/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java +++ b/framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java @@ -452,7 +452,12 @@ private void assertHelloAuthentication(RelayService relay, long timestamp, ByteS Channel channel = mock(Channel.class); Mockito.when(channel.getInetSocketAddress()).thenReturn(socketAddress); Mockito.when(channel.getInetAddress()).thenReturn(socketAddress.getAddress()); + Protocol.HelloMessage.BlockId blockId = Protocol.HelloMessage.BlockId.newBuilder() + .setHash(Sha256Hash.ZERO_HASH.getByteString()).build(); HelloMessage message = new HelloMessage(Protocol.HelloMessage.newBuilder() + .setGenesisBlockId(blockId) + .setSolidBlockId(blockId) + .setHeadBlockId(blockId) .setTimestamp(timestamp).setAddress(address).setSignature(signature).build().toByteArray()); Assert.assertFalse(TronNetService.getP2pConfig().getTrustNodes()