modify test case

Author: MiraculousWang

dapp-chain/side-chain/src/test/java/stest/tron/wallet/common/client/utils/PublicMethed.java

@@ -410,7 +410,7 @@ public static GrpcAPI.Return broadcastTransaction(Transaction transaction,
   public static String triggerContract(byte[] contractAddress, String method, String argsStr,
       Boolean isHex, long callValue, long feeLimit, byte[] ownerAddress,
       String priKey, WalletGrpc.WalletBlockingStub blockingStubFull){
-    return triggerContractSideChain(contractAddress, method, argsStr, isHex, callValue, feeLimit,
+    return triggerContract(contractAddress, method, argsStr, isHex, callValue, feeLimit,
         "0", 0, ownerAddress, priKey, blockingStubFull);
 
   }
@@ -528,13 +528,7 @@ public static String triggerContractSideChain(
       String priKey, WalletGrpc.WalletBlockingStub blockingStubFull
   ){
     //LOADCONF
-
-    final String mainGateWayAddress = Configuration.getByPath("testng.conf")
-        .getString("gateway_address.key1");
-
-    byte[] mainGateWay = WalletClient.decodeFromBase58Check(mainGateWayAddress);
-
-
+    byte[] mainGateWay = PublicMethed.getMaingatewayByteAddr();
 
     Wallet.setAddressPreFixByte(CommonConstant.ADD_PRE_FIX_BYTE_MAINNET);
     ECKey temKey = null;

dapp-chain/side-chain/src/test/java/stest/tron/wallet/common/client/utils/TransactionUtilsForDailybuild.java

@@ -182,18 +182,6 @@ public static Transaction sign(Transaction transaction, ECKey myKey, byte[] chai
 
   public static Transaction sign(Transaction transaction, ECKey myKey) {
     ByteString lockSript = ByteString.copyFrom(myKey.getAddress());
-    Transaction.Builder transactionBuilderSigned = transaction.toBuilder();
-
-    byte[] hash = Sha256Hash.hash(transaction.getRawData().toByteArray());
-    List<Contract> listContract = transaction.getRawData().getContractList();
-    for (int i = 0; i < listContract.size(); i++) {
-      ECDSASignature signature = myKey.sign(hash);
-      ByteString bsSign = ByteString.copyFrom(signature.toByteArray());
-      transactionBuilderSigned.addSignature(
-          bsSign);//Each contract may be signed with a different private key in the future.
-    }
-
-    transaction = transactionBuilderSigned.build();
     boolean isSideChain = false;
     return TransactionUtils
         .sign(transaction, myKey, Wallet.decodeFromBase58Check(mainGateWay), isSideChain);

dapp-chain/side-chain/src/test/java/stest/tron/wallet/witness/WalletTestWitness001.java

@@ -17,6 +17,7 @@
 import org.tron.api.GrpcAPI;
 import org.tron.api.GrpcAPI.NumberMessage;
 import org.tron.api.GrpcAPI.Return;
+import org.tron.api.GrpcAPI.TransactionExtention;
 import org.tron.api.WalletGrpc;
 import org.tron.common.crypto.ECKey;
 import org.tron.common.utils.ByteArray;
@@ -175,8 +176,8 @@ public Boolean voteWitness(HashMap<String, String> witness, byte[] addRess, Stri
     }
 
     Contract.VoteWitnessContract contract = builder.build();
-
-    Transaction transaction = blockingStubFull.voteWitnessAccount(contract);
+    TransactionExtention transactionExtention = blockingStubFull.voteWitnessAccount2(contract);
+    Transaction transaction = transactionExtention.getTransaction();
     if (transaction == null || transaction.getRawData().getContractCount() == 0) {
       logger.info("transaction == null");
       return false;