Skip to content

modify the class name #2255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 28, 2019
Merged

modify the class name #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f53fd63
modify the class name
lvs007 May 28, 2019
2e3306d
modify the class name
lvs007 May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/org/tron/core/db/AccountStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import org.springframework.stereotype.Component;
import org.tron.core.Wallet;
import org.tron.core.capsule.AccountCapsule;
import org.tron.core.db.fast.callback.FastSyncCallBack;
import org.tron.core.db.fast.storetrie.AccountStateStoreTrie;
import org.tron.core.db.accountstate.callback.AccountStateCallBack;
import org.tron.core.db.accountstate.storetrie.AccountStateStoreTrie;

@Slf4j(topic = "DB")
@Component
Expand All @@ -21,7 +21,7 @@ public class AccountStore extends TronStoreWithRevoking<AccountCapsule> {
private static Map<String, byte[]> assertsAddress = new HashMap<>(); // key = name , value = address

@Autowired
private FastSyncCallBack fastSyncCallBack;
private AccountStateCallBack accountStateCallBack;

@Autowired
private AccountStateStoreTrie accountStateStoreTrie;
Expand All @@ -41,7 +41,7 @@ public AccountCapsule get(byte[] key) {
@Override
public void put(byte[] key, AccountCapsule item) {
super.put(key, item);
fastSyncCallBack.accountCallBack(key, item);
accountStateCallBack.accountCallBack(key, item);
}

/**
Expand Down
28 changes: 13 additions & 15 deletions src/main/java/org/tron/core/db/Manager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -77,8 +75,8 @@
import org.tron.core.config.args.GenesisBlock;
import org.tron.core.db.KhaosDatabase.KhaosBlock;
import org.tron.core.db.api.AssetUpdateHelper;
import org.tron.core.db.fast.TrieService;
import org.tron.core.db.fast.callback.FastSyncCallBack;
import org.tron.core.db.accountstate.TrieService;
import org.tron.core.db.accountstate.callback.AccountStateCallBack;
import org.tron.core.db2.core.ISession;
import org.tron.core.db2.core.ITronChainBase;
import org.tron.core.db2.core.SnapshotManager;
Expand Down Expand Up @@ -223,7 +221,7 @@ public class Manager {
private ForkController forkController = ForkController.instance();

@Autowired
private FastSyncCallBack fastSyncCallBack;
private AccountStateCallBack accountStateCallBack;

@Autowired
private TrieService trieService;
Expand Down Expand Up @@ -434,7 +432,7 @@ public void stopRepushTriggerThread() {
@PostConstruct
public void init() {
Message.setManager(this);
fastSyncCallBack.setManager(this);
accountStateCallBack.setManager(this);
trieService.setManager(this);
revokingStore.disable();
revokingStore.check();
Expand Down Expand Up @@ -1320,7 +1318,7 @@ public synchronized BlockCapsule generateBlock(
session.reset();
session.setValue(revokingStore.buildSession());
//
fastSyncCallBack.preExecute(blockCapsule);
accountStateCallBack.preExecute(blockCapsule);

if (needCheckWitnessPermission && !witnessService.
validateWitnessPermission(witnessCapsule.getAddress())) {
Expand Down Expand Up @@ -1371,9 +1369,9 @@ public synchronized BlockCapsule generateBlock(
}
// apply transaction
try (ISession tmpSeesion = revokingStore.buildSession()) {
fastSyncCallBack.preExeTrans();
accountStateCallBack.preExeTrans();
processTransaction(trx, blockCapsule);
fastSyncCallBack.exeTransFinish();
accountStateCallBack.exeTransFinish();
tmpSeesion.merge();
// push into block
blockCapsule.addTransaction(trx);
Expand Down Expand Up @@ -1415,7 +1413,7 @@ public synchronized BlockCapsule generateBlock(
}
} // end of while

fastSyncCallBack.executeGenerateFinish();
accountStateCallBack.executeGenerateFinish();

session.reset();
if (postponedTrxCount > 0) {
Expand Down Expand Up @@ -1517,19 +1515,19 @@ public void processBlock(BlockCapsule block)
}
}
try {
fastSyncCallBack.preExecute(block);
accountStateCallBack.preExecute(block);
for (TransactionCapsule transactionCapsule : block.getTransactions()) {
transactionCapsule.setBlockNum(block.getNum());
if (block.generatedByMyself) {
transactionCapsule.setVerified(true);
}
fastSyncCallBack.preExeTrans();
accountStateCallBack.preExeTrans();
processTransaction(transactionCapsule, block);
fastSyncCallBack.exeTransFinish();
accountStateCallBack.exeTransFinish();
}
fastSyncCallBack.executePushFinish();
accountStateCallBack.executePushFinish();
} finally {
fastSyncCallBack.exceptionFinish();
accountStateCallBack.exceptionFinish();
}

boolean needMaint = needMaintenance(block.getTimeStamp());
Expand Down
2 changes: 1 addition & 1 deletion ...tron/core/db/fast/AccountStateEntity.java → ...e/db/accountstate/AccountStateEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.tron.core.db.fast;
package org.tron.core.db.accountstate;

import lombok.extern.slf4j.Slf4j;
import org.tron.core.Wallet;
Expand Down
4 changes: 2 additions & 2 deletions ...va/org/tron/core/db/fast/TrieService.java → ...ron/core/db/accountstate/TrieService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.tron.core.db.fast;
package org.tron.core.db.accountstate;

import com.google.protobuf.ByteString;
import com.google.protobuf.Internal;
Expand All @@ -9,7 +9,7 @@
import org.tron.common.crypto.Hash;
import org.tron.core.capsule.BlockCapsule;
import org.tron.core.db.Manager;
import org.tron.core.db.fast.storetrie.AccountStateStoreTrie;
import org.tron.core.db.accountstate.storetrie.AccountStateStoreTrie;

@Slf4j(topic = "AccountState")
@Component
Expand Down
8 changes: 4 additions & 4 deletions ...re/db/fast/callback/FastSyncCallBack.java → ...tstate/callback/AccountStateCallBack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.tron.core.db.fast.callback;
package org.tron.core.db.accountstate.callback;

import com.google.protobuf.ByteString;
import com.google.protobuf.Internal;
Expand All @@ -16,16 +16,16 @@
import org.tron.core.capsule.BlockCapsule;
import org.tron.core.capsule.utils.RLP;
import org.tron.core.db.Manager;
import org.tron.core.db.fast.AccountStateEntity;
import org.tron.core.db.fast.storetrie.AccountStateStoreTrie;
import org.tron.core.db.accountstate.AccountStateEntity;
import org.tron.core.db.accountstate.storetrie.AccountStateStoreTrie;
import org.tron.core.exception.BadBlockException;
import org.tron.core.trie.TrieImpl;
import org.tron.core.trie.TrieImpl.Node;
import org.tron.core.trie.TrieImpl.ScanAction;

@Slf4j(topic = "AccountState")
@Component
public class FastSyncCallBack {
public class AccountStateCallBack {

private BlockCapsule blockCapsule;
private volatile boolean execute = false;
Expand Down
6 changes: 3 additions & 3 deletions ...fast/storetrie/AccountStateStoreTrie.java → ...tate/storetrie/AccountStateStoreTrie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.tron.core.db.fast.storetrie;
package org.tron.core.db.accountstate.storetrie;

import javax.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -9,8 +9,8 @@
import org.tron.core.capsule.BytesCapsule;
import org.tron.core.capsule.utils.RLP;
import org.tron.core.db.TronStoreWithRevoking;
import org.tron.core.db.fast.AccountStateEntity;
import org.tron.core.db.fast.TrieService;
import org.tron.core.db.accountstate.AccountStateEntity;
import org.tron.core.db.accountstate.TrieService;
import org.tron.core.db2.common.DB;
import org.tron.core.trie.TrieImpl;

Expand Down