Merge pull request #3333 from BentoCrypto/develop

correcting several spellings
tronprotocol · Aug 22, 2020 · b00e5f7 · b00e5f7
2 parents fa7eec5 + 1bb7c9a
commit b00e5f7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/chainbase/src/main/java/org/tron/core/capsule/BlockCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/BlockCapsule.java
@@ -233,7 +233,7 @@ public void setAccountStateRoot(byte[] root) {
         this.block.getBlockHeader().toBuilder().setRawData(blockHeaderRaw)).build();
   }
 
-  /* only for genisis */
+  /* only for genesis */
   public void setWitness(String witness) {
     BlockHeader.raw blockHeaderRaw =
         this.block.getBlockHeader().getRawData().toBuilder().setWitnessAddress(

diff --git a/framework/src/main/java/org/tron/common/overlay/discover/node/statistics/NodeStatistics.java b/framework/src/main/java/org/tron/common/overlay/discover/node/statistics/NodeStatistics.java
@@ -166,7 +166,7 @@ public String toString() {
         + " "
         + messageStatistics.discoverOutNeighbours + "/" + messageStatistics.discoverInFindNode
         + " "
-        + ((int) discoverMessageLatency.getAvrg()) + "ms"
+        + ((int) discoverMessageLatency.getAvg()) + "ms"
         + ", p2p: " + p2pHandShake + "/" + messageStatistics.p2pInHello + "/"
         + messageStatistics.p2pOutHello + " "
         + ", tron: " + messageStatistics.tronInMessage + "/" + messageStatistics.tronOutMessage
@@ -205,7 +205,7 @@ public void add(long value) {
       count++;
     }
 
-    public long getAvrg() {
+    public long getAvg() {
       return count == 0 ? 0 : sum / count;
     }
 

diff --git a/framework/src/main/java/org/tron/common/overlay/discover/node/statistics/Reputation.java b/framework/src/main/java/org/tron/common/overlay/discover/node/statistics/Reputation.java
@@ -29,8 +29,8 @@ private int getPacketLossRateScore() {
   }
 
   private int getNetLatencyScore() {
-    return (int) (nodeStatistics.discoverMessageLatency.getAvrg() == 0 ? 0
-        : min(1000 / nodeStatistics.discoverMessageLatency.getAvrg(), 20));
+    return (int) (nodeStatistics.discoverMessageLatency.getAvg() == 0 ? 0
+        : min(1000 / nodeStatistics.discoverMessageLatency.getAvg(), 20));
   }
 
   private int getHandshakeScore() {

diff --git a/framework/src/main/java/org/tron/common/overlay/server/SyncPool.java b/framework/src/main/java/org/tron/common/overlay/server/SyncPool.java
@@ -144,7 +144,7 @@ public synchronized void onConnect(Channel peer) {
       activePeers.add(peerConnection);
       activePeers
           .sort(Comparator.comparingDouble(
-              c -> c.getNodeStatistics().pingMessageLatency.getAvrg()));
+              c -> c.getNodeStatistics().pingMessageLatency.getAvg()));
       peerConnection.onConnect();
     }
   }

diff --git a/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java b/framework/src/main/java/org/tron/core/net/peer/PeerConnection.java
@@ -162,7 +162,7 @@ public String log() {
 
         getNodeStatistics().pingMessageLatency.getCount(),
         getNodeStatistics().pingMessageLatency.getMax(),
-        getNodeStatistics().pingMessageLatency.getAvrg(),
+        getNodeStatistics().pingMessageLatency.getAvg(),
         getNodeStatistics().pingMessageLatency.getMin(),
         getNodeStatistics().pingMessageLatency.getLast(),
 

diff --git a/framework/src/main/java/org/tron/core/services/NodeInfoService.java b/framework/src/main/java/org/tron/core/services/NodeInfoService.java
@@ -131,7 +131,7 @@ private void setConnectInfo(NodeInfo nodeInfo) {
       PeerInfo peerInfo = new PeerInfo();
       peerInfo.setHeadBlockWeBothHave(peerConnection.getBlockBothHave().getString());
       peerInfo.setActive(peerConnection.isActive());
-      peerInfo.setAvgLatency(peerConnection.getNodeStatistics().pingMessageLatency.getAvrg());
+      peerInfo.setAvgLatency(peerConnection.getNodeStatistics().pingMessageLatency.getAvg());
       peerInfo.setBlockInPorcSize(peerConnection.getSyncBlockInProcess().size());
       peerInfo.setConnectTime(peerConnection.getStartTime());
       peerInfo.setDisconnectTimes(peerConnection.getNodeStatistics().getDisconnectTimes());

diff --git a/framework/src/test/java/org/tron/common/overlay/discover/node/NodeStatisticsTest.java b/framework/src/test/java/org/tron/common/overlay/discover/node/NodeStatisticsTest.java
@@ -64,7 +64,7 @@ public void testNode() throws NoSuchFieldException, IllegalAccessException {
     this.nodeStatistics.resetTcpFlow();
     this.nodeStatistics.discoverMessageLatency.add(10);
     this.nodeStatistics.discoverMessageLatency.add(20);
-    long avg = this.nodeStatistics.discoverMessageLatency.getAvrg();
+    long avg = this.nodeStatistics.discoverMessageLatency.getAvg();
     Assert.assertEquals(15, avg);
 
   }

diff --git a/framework/src/test/java/org/tron/program/SolidityNodeTest.java b/framework/src/test/java/org/tron/program/SolidityNodeTest.java
@@ -90,9 +90,9 @@ public void testSolidityGrpcCall() {
     DynamicProperties dynamicProperties = databaseGrpcClient.getDynamicProperties();
     Assert.assertNotNull(dynamicProperties);
 
-    Block genisisBlock = databaseGrpcClient.getBlock(0);
-    Assert.assertNotNull(genisisBlock);
-    Assert.assertFalse(genisisBlock.getTransactionsList().isEmpty());
+    Block genesisBlock = databaseGrpcClient.getBlock(0);
+    Assert.assertNotNull(genesisBlock);
+    Assert.assertFalse(genesisBlock.getTransactionsList().isEmpty());
   }
 
 }