From 13880d0fe4bcb1c3f4c27ed92c1887e0aed1b9e3 Mon Sep 17 00:00:00 2001
From: dalaocu <njumjy06@126.com>
Date: Tue, 20 Oct 2020 21:04:41 +0800
Subject: [PATCH] support single send & rename transactionProcessor

---
 .../src/main/java/org/fisco/bcos/sdk/contract/Contract.java   | 4 ++--
 .../sdk/transaction/manager/TransactionProcessorFactory.java  | 2 +-
 .../org/fisco/bcos/sdk/transaction/tools/ContractLoader.java  | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/Contract.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/Contract.java
index e78967d84..743f79002 100644
--- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/Contract.java
+++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/Contract.java
@@ -96,7 +96,7 @@ protected Contract(
                 contractAddress,
                 client,
                 credential,
-                TransactionProcessorFactory.createTransactionManager(client, credential));
+                TransactionProcessorFactory.createTransactionProcessor(client, credential));
     }
 
     protected static <T extends Contract> T deploy(
@@ -132,7 +132,7 @@ protected static <T extends Contract> T deploy(
                 type,
                 client,
                 credential,
-                TransactionProcessorFactory.createTransactionManager(client, credential),
+                TransactionProcessorFactory.createTransactionProcessor(client, credential),
                 binary,
                 encodedConstructor);
     }
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessorFactory.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessorFactory.java
index c302c23a6..70583768e 100644
--- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessorFactory.java
+++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/TransactionProcessorFactory.java
@@ -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());
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/tools/ContractLoader.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/tools/ContractLoader.java
index 3ebb80d9a..f9a6957c7 100644
--- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/tools/ContractLoader.java
+++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/tools/ContractLoader.java
@@ -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()) {