Skip to content

Commit a51c246

Browse files
xxo1shinexxo1shine
authored
Merge pull request tronprotocol#3173 from AlexeyAkhunov-star/develop
Fix spelling errors
2 parents 5486b55 + 7c49442 commit a51c246

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

‎Tron protobuf protocol document.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2298,7 +2298,7 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
22982298

22992299
`osName`: os name.
23002300

2301-
`jvmTotalMemoery`: jvm total memory.
2301+
`jvmTotalMemory`: jvm total memory.
23022302

23032303
`jvmFreeMemory`: jvm unused memory.
23042304

@@ -2368,7 +2368,7 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
23682368
double cpuRate = 6;
23692369
string javaVersion = 7;
23702370
string osName = 8;
2371-
int64 jvmTotalMemoery = 9;
2371+
int64 jvmTotalMemory = 9;
23722372
int64 jvmFreeMemory = 10;
23732373
double processCpuRate = 11;
23742374
repeated MemoryDescInfo memoryDescInfoList = 12;
@@ -2394,4 +2394,4 @@ message `SmartContract` has mutiple attributes and nested message `ABI`
23942394
}
23952395
```
23962396

2397-
2397+

‎common/src/main/java/org/tron/common/entity/NodeInfo.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public Protocol.NodeInfo transferToProtoEntity() {
205205
machineBuilder.setCpuRate(machineInfo.getCpuRate());
206206
machineBuilder.setJavaVersion(machineInfo.getJavaVersion());
207207
machineBuilder.setOsName(machineInfo.getOsName());
208-
machineBuilder.setJvmTotalMemoery(machineInfo.getJvmTotalMemoery());
208+
machineBuilder.setJvmTotalMemory(machineInfo.getJvmTotalMemory());
209209
machineBuilder.setJvmFreeMemory(machineInfo.getJvmFreeMemory());
210210
machineBuilder.setProcessCpuRate(machineInfo.getProcessCpuRate());
211211
for (MemoryDescInfo memoryDescInfo : machineInfo.getMemoryDescInfoList()) {
@@ -247,7 +247,7 @@ public static class MachineInfo {
247247
private double cpuRate;
248248
private String javaVersion;
249249
private String osName;
250-
private long jvmTotalMemoery;
250+
private long jvmTotalMemory;
251251
private long jvmFreeMemory;
252252
private double processCpuRate;
253253
private List<MemoryDescInfo> memoryDescInfoList = new ArrayList<>();
@@ -316,12 +316,12 @@ public MachineInfo setOsName(String osName) {
316316
return this;
317317
}
318318

319-
public long getJvmTotalMemoery() {
320-
return jvmTotalMemoery;
319+
public long getJvmTotalMemory() {
320+
return jvmTotalMemory;
321321
}
322322

323-
public MachineInfo setJvmTotalMemoery(long jvmTotalMemoery) {
324-
this.jvmTotalMemoery = jvmTotalMemoery;
323+
public MachineInfo setJvmTotalMemory(long jvmTotalMemory) {
324+
this.jvmTotalMemory = jvmTotalMemory;
325325
return this;
326326
}
327327

‎framework/src/main/java/org/tron/core/Wallet.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -641,43 +641,43 @@ public Protocol.ChainParameters getChainParameters() {
641641
.setKey("getMaintenanceTimeInterval")
642642
.setValue(chainBaseManager.getDynamicPropertiesStore().getMaintenanceTimeInterval())
643643
.build());
644-
// ACCOUNT_UPGRADE_COST, //drop ,1
644+
// ACCOUNT_UPGRADE_COST, //SUN ,1
645645
builder.addChainParameter(
646646
Protocol.ChainParameters.ChainParameter.newBuilder()
647647
.setKey("getAccountUpgradeCost")
648648
.setValue(chainBaseManager.getDynamicPropertiesStore().getAccountUpgradeCost())
649649
.build());
650-
// CREATE_ACCOUNT_FEE, //drop ,2
650+
// CREATE_ACCOUNT_FEE, //SUN ,2
651651
builder.addChainParameter(
652652
Protocol.ChainParameters.ChainParameter.newBuilder()
653653
.setKey("getCreateAccountFee")
654654
.setValue(chainBaseManager.getDynamicPropertiesStore().getCreateAccountFee())
655655
.build());
656-
// TRANSACTION_FEE, //drop ,3
656+
// TRANSACTION_FEE, //SUN ,3
657657
builder.addChainParameter(
658658
Protocol.ChainParameters.ChainParameter.newBuilder()
659659
.setKey("getTransactionFee")
660660
.setValue(chainBaseManager.getDynamicPropertiesStore().getTransactionFee())
661661
.build());
662-
// ASSET_ISSUE_FEE, //drop ,4
662+
// ASSET_ISSUE_FEE, //SUN ,4
663663
builder.addChainParameter(
664664
Protocol.ChainParameters.ChainParameter.newBuilder()
665665
.setKey("getAssetIssueFee")
666666
.setValue(chainBaseManager.getDynamicPropertiesStore().getAssetIssueFee())
667667
.build());
668-
// WITNESS_PAY_PER_BLOCK, //drop ,5
668+
// WITNESS_PAY_PER_BLOCK, //SUN ,5
669669
builder.addChainParameter(
670670
Protocol.ChainParameters.ChainParameter.newBuilder()
671671
.setKey("getWitnessPayPerBlock")
672672
.setValue(chainBaseManager.getDynamicPropertiesStore().getWitnessPayPerBlock())
673673
.build());
674-
// WITNESS_STANDBY_ALLOWANCE, //drop ,6
674+
// WITNESS_STANDBY_ALLOWANCE, //SUN ,6
675675
builder.addChainParameter(
676676
Protocol.ChainParameters.ChainParameter.newBuilder()
677677
.setKey("getWitnessStandbyAllowance")
678678
.setValue(chainBaseManager.getDynamicPropertiesStore().getWitnessStandbyAllowance())
679679
.build());
680-
// CREATE_NEW_ACCOUNT_FEE_IN_SYSTEM_CONTRACT, //drop ,7
680+
// CREATE_NEW_ACCOUNT_FEE_IN_SYSTEM_CONTRACT, //SUN ,7
681681
builder.addChainParameter(
682682
Protocol.ChainParameters.ChainParameter.newBuilder()
683683
.setKey("getCreateNewAccountFeeInSystemContract")
@@ -702,13 +702,13 @@ public Protocol.ChainParameters getChainParameters() {
702702
.setKey("getRemoveThePowerOfTheGr")
703703
.setValue(chainBaseManager.getDynamicPropertiesStore().getRemoveThePowerOfTheGr())
704704
.build());
705-
// ENERGY_FEE, // drop, 11
705+
// ENERGY_FEE, // SUN, 11
706706
builder.addChainParameter(
707707
Protocol.ChainParameters.ChainParameter.newBuilder()
708708
.setKey("getEnergyFee")
709709
.setValue(chainBaseManager.getDynamicPropertiesStore().getEnergyFee())
710710
.build());
711-
// EXCHANGE_CREATE_FEE, // drop, 12
711+
// EXCHANGE_CREATE_FEE, // SUN, 12
712712
builder.addChainParameter(
713713
Protocol.ChainParameters.ChainParameter.newBuilder()
714714
.setKey("getExchangeCreateFee")

‎framework/src/main/java/org/tron/core/db/TransactionCache.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ public class TransactionCache extends TronStoreWithRevoking<BytesCapsule> {
1212
@Autowired
1313
public TransactionCache(@Value("trans-cache") String dbName) {
1414
super(new TxCacheDB(dbName));
15-
;
1615
}
1716
}

‎framework/src/main/java/org/tron/core/services/NodeInfoService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private void setMachineInfo(NodeInfo nodeInfo) {
7676
machineInfo.setJavaVersion(runtimeMXBean.getSystemProperties().get("java.version"));
7777
machineInfo
7878
.setOsName(operatingSystemMXBean.getName() + " " + operatingSystemMXBean.getVersion());
79-
machineInfo.setJvmTotalMemoery(memoryMXBean.getHeapMemoryUsage().getMax());
79+
machineInfo.setJvmTotalMemory(memoryMXBean.getHeapMemoryUsage().getMax());
8080
machineInfo.setJvmFreeMemory(
8181
memoryMXBean.getHeapMemoryUsage().getMax() - memoryMXBean.getHeapMemoryUsage().getUsed());
8282
machineInfo.setProcessCpuRate(operatingSystemMXBean.getProcessCpuLoad());

‎protocol/src/main/protos/core/Tron.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ message NodeInfo {
606606
double cpuRate = 6;
607607
string javaVersion = 7;
608608
string osName = 8;
609-
int64 jvmTotalMemoery = 9;
609+
int64 jvmTotalMemory = 9;
610610
int64 jvmFreeMemory = 10;
611611
double processCpuRate = 11;
612612
repeated MemoryDescInfo memoryDescInfoList = 12;
@@ -766,4 +766,4 @@ message PBFTCommitResult {
766766

767767
message SRL {
768768
repeated bytes srAddress = 1;
769-
}
769+
}

0 commit comments

Comments
 (0)