Skip to content

Commit 6c39da4

Browse files
ZaraLangZaraLang
committed
fix variable spelling error and punctuation misuse
1 parent ceb007a commit 6c39da4

24 files changed

Lines changed: 165 additions & 165 deletions

File tree

‎chainbase/src/main/java/org/tron/core/db/StorageMarket.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public AccountCapsule buyStorageBytes(AccountCapsule accountCapsule, long storag
162162
long quant = exchange_from_supply(true, relay);
163163

164164
long newBalance = accountCapsule.getBalance() - quant;
165-
logger.info("newBalance： " + newBalance);
165+
logger.info("newBalance: " + newBalance);
166166

167167
long newStorageLimit = currentStorageLimit + storageBought;
168168
logger.info(
@@ -189,7 +189,7 @@ public void buyStorage(AccountCapsule accountCapsule, long quant) {
189189
long currentStorageLimit = accountCapsule.getStorageLimit();
190190

191191
long newBalance = accountCapsule.getBalance() - quant;
192-
logger.info("newBalance： " + newBalance);
192+
logger.info("newBalance: " + newBalance);
193193

194194
long storageBought = exchange(quant, true);
195195
long newStorageLimit = currentStorageLimit + storageBought;

‎chainbase/src/main/java/org/tron/core/store/AccountIdIndexStore.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.tron.core.capsule.BytesCapsule;
1111
import org.tron.core.db.TronStoreWithRevoking;
1212

13-
//todo ： need Compatibility test
13+
//todo : need Compatibility test
1414
@Component
1515
public class AccountIdIndexStore extends TronStoreWithRevoking<BytesCapsule> {
1616

‎framework/src/main/java/org/tron/common/application/ApplicationImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public void shutdown() {
6868
closeRevokingStore();
6969
closeAllStore();
7070
}
71-
dbManager.stopRepushThread();
72-
dbManager.stopRepushTriggerThread();
71+
dbManager.stopRePushThread();
72+
dbManager.stopRePushTriggerThread();
7373
EventPluginLoader.getInstance().stopPlugin();
7474
logger.info("******** end to shutdown ********");
7575
}

‎framework/src/main/java/org/tron/common/application/TronApplicationContext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public void destroy() {
3939
nodeManager.close();
4040

4141
Manager dbManager = getBean(Manager.class);
42-
dbManager.stopRepushThread();
43-
dbManager.stopRepushTriggerThread();
42+
dbManager.stopRePushThread();
43+
dbManager.stopRePushTriggerThread();
4444
super.destroy();
4545
}
4646
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,7 +1413,7 @@ public BytesMessage getNullifier(ByteString id) {
14131413
return null;
14141414
}
14151415
BytesCapsule nullifier = null;
1416-
nullifier = dbManager.getNullfierStore().get(id.toByteArray());
1416+
nullifier = dbManager.getNullifierStore().get(id.toByteArray());
14171417

14181418
if (nullifier != null) {
14191419
return BytesMessage.newBuilder().setValue(ByteString.copyFrom(nullifier.getData())).build();
@@ -2139,7 +2139,7 @@ public SpendResult isSpend(NoteParameters noteParameters) throws
21392139
note.getRcm().toByteArray());
21402140
byte[] nf = baseNote.nullifier(ak, nk, voucherContainer.position());
21412141

2142-
if (dbManager.getNullfierStore().has(nf)) {
2142+
if (dbManager.getNullifierStore().has(nf)) {
21432143
result = SpendResult.newBuilder()
21442144
.setResult(true)
21452145
.setMessage("Input note has been spent")

‎framework/src/main/java/org/tron/core/capsule/BlockIdCapsule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public boolean equals(Object o) {
5353
}
5454

5555
public String getString() {
56-
return "Num: " + num + ",ID:" + super.toString();
56+
return "Num: " + num + ", ID:" + super.toString();
5757
}
5858

5959
@Override

‎framework/src/main/java/org/tron/core/consensus/ProposalController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static ProposalController createInstance(Manager manager) {
2626
public void processProposals() {
2727
long latestProposalNum = manager.getDynamicPropertiesStore().getLatestProposalNum();
2828
if (latestProposalNum == 0) {
29-
logger.info("latestProposalNum is 0,return");
29+
logger.info("latestProposalNum is 0, return");
3030
return;
3131
}
3232

@@ -45,14 +45,14 @@ public void processProposals() {
4545

4646
if (proposalCapsule.hasProcessed()) {
4747
logger
48-
.info("Proposal has processed，id:[{}],skip it and before it",
48+
.info("Proposal has processed, id:[{}], skip it and before it",
4949
proposalCapsule.getID());
5050
//proposals with number less than this one, have been processed before
5151
break;
5252
}
5353

5454
if (proposalCapsule.hasCanceled()) {
55-
logger.info("Proposal has canceled，id:[{}],skip it", proposalCapsule.getID());
55+
logger.info("Proposal has canceled, id:[{}], skip it", proposalCapsule.getID());
5656
proposalNum--;
5757
continue;
5858
}
@@ -65,7 +65,7 @@ public void processProposals() {
6565
}
6666

6767
proposalNum--;
68-
logger.info("Proposal has not expired，id:[{}],skip it", proposalCapsule.getID());
68+
logger.info("Proposal has not expired, id:[{}], skip it", proposalCapsule.getID());
6969
}
7070
logger.info("Processing proposals done, oldest proposal[{}]", proposalNum);
7171
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,12 @@ public void consume(TransactionCapsule trx, TransactionTrace trace)
8787
bytesSize += Constant.MAX_RESULT_SIZE_IN_TX;
8888
}
8989

90-
logger.debug("trxId {},bandwidth cost :{}", trx.getTransactionId(), bytesSize);
90+
logger.debug("trxId {}, bandwidth cost: {}", trx.getTransactionId(), bytesSize);
9191
trace.setNetBill(bytesSize, 0);
9292
byte[] address = TransactionCapsule.getOwner(contract);
9393
AccountCapsule accountCapsule = dbManager.getAccountStore().get(address);
9494
if (accountCapsule == null) {
95-
throw new ContractValidateException("account not exists");
95+
throw new ContractValidateException("account does not exist");
9696
}
9797
long now = dbManager.getHeadSlot();
9898

@@ -120,7 +120,7 @@ public void consume(TransactionCapsule trx, TransactionTrace trace)
120120

121121
long fee = dbManager.getDynamicPropertiesStore().getTransactionFee() * bytesSize;
122122
throw new AccountResourceInsufficientException(
123-
"Account Insufficient bandwidth[" + bytesSize + "] and balance["
123+
"Account has insufficient bandwidth[" + bytesSize + "] and balance["
124124
+ fee + "] to create new account");
125125
}
126126
}
@@ -235,7 +235,7 @@ private boolean useAssetAccountNet(Contract contract, AccountCapsule accountCaps
235235
dbManager.getAssetIssueStore(), dbManager.getAssetIssueV2Store())
236236
.get(assetName.toByteArray());
237237
if (assetIssueCapsule == null) {
238-
throw new ContractValidateException("asset not exists");
238+
throw new ContractValidateException("asset does not exist");
239239
}
240240

241241
String tokenName = ByteArray.toStr(assetName.toByteArray());
@@ -288,7 +288,7 @@ private boolean useAssetAccountNet(Contract contract, AccountCapsule accountCaps
288288
long newIssuerNetUsage = increase(issuerNetUsage, 0, latestConsumeTime, now);
289289

290290
if (bytes > (issuerNetLimit - newIssuerNetUsage)) {
291-
logger.debug("The " + tokenID + " issuer'bandwidth is not enough");
291+
logger.debug("The " + tokenID + " issuer's bandwidth is not enough");
292292
return false;
293293
}
294294

@@ -363,7 +363,7 @@ private boolean useAccountNet(AccountCapsule accountCapsule, long bytes, long no
363363
long newNetUsage = increase(netUsage, 0, latestConsumeTime, now);
364364

365365
if (bytes > (netLimit - newNetUsage)) {
366-
logger.debug("net usage is running out. now use free net usage");
366+
logger.debug("net usage is running out, now use free net usage");
367367
return false;
368368
}
369369

0 commit comments

Comments
 (0)