Skip to content

support single send & rename transactionProcessor #169

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 1 commit into from
Oct 21, 2020
Merged

support single send & rename transactionProcessor #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/Contract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ protected Contract(
contractAddress,
client,
credential,
TransactionProcessorFactory.createTransactionManager(client, credential));
TransactionProcessorFactory.createTransactionProcessor(client, credential));
}

protected static <T extends Contract> T deploy(
Expand Down Expand Up @@ -132,7 +132,7 @@ protected static <T extends Contract> T deploy(
type,
client,
credential,
TransactionProcessorFactory.createTransactionManager(client, credential),
TransactionProcessorFactory.createTransactionProcessor(client, credential),
binary,
encodedConstructor);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ion/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static Pair<String, Integer> getChainIdAndGroupId(Client client) {
}
}

public static TransactionProcessor createTransactionManager(
public static TransactionProcessor createTransactionProcessor(
Client client, CryptoKeyPair cryptoKeyPair) {
Pair<String, Integer> pair = getChainIdAndGroupId(client);
return new TransactionProcessor(client, cryptoKeyPair, pair.getRight(), pair.getLeft());
Expand Down
4 changes: 4 additions & 0 deletions sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/tools/ContractLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ public ContractLoader(String abiFilePath, String binaryFilePath) throws Exceptio
}

public BinInfo binInfo(String binaryFilePath) throws IOException {
if (StringUtils.isEmpty(binaryFilePath)) {
log.warn("Empty bin directory, cannot deploy any contract");
return new BinInfo(Collections.emptyMap());
}
String[] s = {"bin"};
Collection<File> fileCollection = FileUtils.listFiles(new File(binaryFilePath), s, true);
if (fileCollection.isEmpty()) {
Expand Down