Skip to content

Commit 8317ded

Browse files
317787106317787106
committed
add some comment
1 parent 6c0301a commit 8317ded

File tree

6 files changed

+40
-26
lines changed

6 files changed

+40
-26
lines changed

‎framework/src/main/java/org/tron/core/net/peer/PeerStatusCheck.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public void statusCheck() {
4343
long now = System.currentTimeMillis();
4444

4545
if (tronNetDelegate == null) {
46+
//only occurs in mock test. TODO fix test
4647
return;
4748
}
4849
tronNetDelegate.getActivePeer().forEach(peer -> {

‎framework/src/test/java/org/tron/common/BaseTest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import org.tron.core.config.args.Args;
2626
import org.tron.core.db.Manager;
2727
import org.tron.core.exception.BalanceInsufficientException;
28+
import org.tron.core.net.peer.PeerConnection;
29+
import org.tron.core.net.peer.PeerManager;
2830
import org.tron.core.store.AccountStore;
2931
import org.tron.protos.Protocol;
3032

@@ -68,6 +70,12 @@ public static void destroy() {
6870
Args.clearParam();
6971
}
7072

73+
public void closePeer() {
74+
for (PeerConnection p : PeerManager.getPeers()) {
75+
PeerManager.remove(p.getChannel());
76+
}
77+
}
78+
7179
public Protocol.Block getSignedBlock(ByteString witness, long time, byte[] privateKey) {
7280
long blockTime = System.currentTimeMillis() / 3000 * 3000;
7381
if (time != 0) {

‎framework/src/test/java/org/tron/core/net/services/RelayServiceTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ public static void init() {
7272

7373
@After
7474
public void clearPeers() {
75-
for (PeerConnection p : PeerManager.getPeers()) {
76-
PeerManager.remove(p.getChannel());
77-
}
75+
closePeer();
7876
}
7977

8078
@Test

‎framework/src/test/java/org/tron/core/net/services/ResilienceServiceTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ public static void init() throws IOException {
4141

4242
@After
4343
public void clearPeers() {
44-
for (PeerConnection p : PeerManager.getPeers()) {
45-
PeerManager.remove(p.getChannel());
46-
}
44+
closePeer();
4745
}
4846

4947
@Test

‎framework/src/test/java/org/tron/core/services/NodeInfoServiceTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.tron.core.config.args.Args;
2121
import org.tron.core.net.P2pEventHandlerImpl;
2222
import org.tron.core.net.TronNetService;
23-
import org.tron.core.net.peer.PeerConnection;
2423
import org.tron.core.net.peer.PeerManager;
2524
import org.tron.p2p.P2pConfig;
2625
import org.tron.p2p.connection.Channel;
@@ -48,9 +47,7 @@ public static void init() {
4847

4948
@After
5049
public void clearPeers() {
51-
for (PeerConnection p : PeerManager.getPeers()) {
52-
PeerManager.remove(p.getChannel());
53-
}
50+
closePeer();
5451
}
5552

5653
@Test

‎framework/src/test/java/org/tron/core/services/jsonrpc/TransactionResultTest.java‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,61 @@
99
import org.tron.core.Constant;
1010
import org.tron.core.Wallet;
1111
import org.tron.core.capsule.BlockCapsule;
12+
import org.tron.core.capsule.TransactionCapsule;
1213
import org.tron.core.config.args.Args;
1314
import org.tron.core.services.jsonrpc.types.TransactionResult;
1415
import org.tron.protos.Protocol;
16+
import org.tron.protos.contract.SmartContractOuterClass;
1517

1618
public class TransactionResultTest extends BaseTest {
1719

1820
@Resource
1921
private Wallet wallet;
2022

23+
private static final String OWNER_ADDRESS = "41548794500882809695a8a687866e76d4271a1abc";
24+
private static final String CONTRACT_ADDRESS = "A0B4750E2CD76E19DCA331BF5D089B71C3C2798548";
25+
2126
static {
22-
Args.setParam(new String[]{"-d", dbPath()}, Constant.TEST_CONF);
27+
Args.setParam(new String[] {"-d", dbPath()}, Constant.TEST_CONF);
2328
}
2429

2530
@Test
2631
public void testBuildTransactionResultWithBlock() {
27-
Protocol.Transaction.raw.Builder raw = Protocol.Transaction.raw.newBuilder().addContract(
28-
Protocol.Transaction.Contract.newBuilder().setType(
29-
Protocol.Transaction.Contract.ContractType.TriggerSmartContract));
30-
Protocol.Transaction transaction = Protocol.Transaction.newBuilder().setRawData(raw).build();
32+
SmartContractOuterClass.TriggerSmartContract.Builder builder2 =
33+
SmartContractOuterClass.TriggerSmartContract.newBuilder()
34+
.setOwnerAddress(ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)))
35+
.setContractAddress(ByteString.copyFrom(ByteArray.fromHexString(CONTRACT_ADDRESS)));
36+
TransactionCapsule transactionCapsule = new TransactionCapsule(builder2.build(),
37+
Protocol.Transaction.Contract.ContractType.TriggerSmartContract);
38+
Protocol.Transaction transaction = transactionCapsule.getInstance();
3139
BlockCapsule blockCapsule = new BlockCapsule(Protocol.Block.newBuilder().setBlockHeader(
3240
Protocol.BlockHeader.newBuilder().setRawData(Protocol.BlockHeader.raw.newBuilder()
3341
.setParentHash(ByteString.copyFrom(ByteArray.fromHexString(
3442
"0304f784e4e7bae517bcab94c3e0c9214fb4ac7ff9d7d5a937d1f40031f87b82")))
3543
.setNumber(9))).addTransactions(transaction).build());
3644

37-
TransactionResult transactionResult = new TransactionResult(blockCapsule,0, transaction,
38-
100,1, wallet);
45+
TransactionResult transactionResult = new TransactionResult(blockCapsule, 0, transaction,
46+
100, 1, wallet);
3947
Assert.assertEquals(transactionResult.getBlockNumber(), "0x9");
40-
Assert.assertEquals(transactionResult.getHash(),
41-
"0xdebef90d0a8077620711b1b5af2b702665887ddcbf80868108026e1ab5e0bfb7");
48+
Assert.assertEquals("0x5691531881bc44adbc722060d85fdf29265823db8e884b0d104fcfbba253cf11",
49+
transactionResult.getHash());
4250
Assert.assertEquals(transactionResult.getGasPrice(), "0x1");
4351
Assert.assertEquals(transactionResult.getGas(), "0x64");
4452
}
4553

4654
@Test
4755
public void testBuildTransactionResult() {
48-
Protocol.Transaction.raw.Builder raw = Protocol.Transaction.raw.newBuilder().addContract(
49-
Protocol.Transaction.Contract.newBuilder().setType(
50-
Protocol.Transaction.Contract.ContractType.TriggerSmartContract));
51-
Protocol.Transaction transaction = Protocol.Transaction.newBuilder().setRawData(raw).build();
52-
TransactionResult transactionResult = new TransactionResult(transaction, wallet);
53-
Assert.assertEquals(transactionResult.getHash(),
54-
"0xdebef90d0a8077620711b1b5af2b702665887ddcbf80868108026e1ab5e0bfb7");
56+
SmartContractOuterClass.TriggerSmartContract.Builder builder2 =
57+
SmartContractOuterClass.TriggerSmartContract.newBuilder()
58+
.setOwnerAddress(ByteString.copyFrom(ByteArray.fromHexString(OWNER_ADDRESS)))
59+
.setContractAddress(ByteString.copyFrom(ByteArray.fromHexString(CONTRACT_ADDRESS)));
60+
TransactionCapsule transactionCapsule = new TransactionCapsule(builder2.build(),
61+
Protocol.Transaction.Contract.ContractType.TriggerSmartContract);
62+
63+
TransactionResult transactionResult =
64+
new TransactionResult(transactionCapsule.getInstance(), wallet);
65+
Assert.assertEquals("0x5691531881bc44adbc722060d85fdf29265823db8e884b0d104fcfbba253cf11",
66+
transactionResult.getHash());
5567
Assert.assertEquals(transactionResult.getGasPrice(), "0x");
5668
Assert.assertEquals(transactionResult.getNonce(), "0x0000000000000000");
5769
}

0 commit comments

Comments
 (0)