Merge pull request #3640 from tronprotocol/hotfix/modify_solidityFile

modify solidity File

Author: MiraculousWang

framework/src/test/java/stest/tron/wallet/contract/scenario/ContractScenario006.java

@@ -72,7 +72,7 @@ public void deployFomo3D() {
     logger.info(Long.toString(PublicMethed.queryAccount(contract006Key, blockingStubFull)
         .getBalance()));
     Assert.assertTrue(PublicMethed.freezeBalanceGetEnergy(contract006Address, 100000000L,
-        0, 1, contract006Key, blockingStubFull));
+        3, 1, contract006Key, blockingStubFull));
     PublicMethed.waitProduceNextBlock(blockingStubFull);
     AccountResourceMessage accountResource = PublicMethed.getAccountResource(contract006Address,
         blockingStubFull);

framework/src/test/java/stest/tron/wallet/contract/scenario/ContractScenario007.java

@@ -75,12 +75,12 @@ public void deployErc721CardMigration() {
     logger.info("before balance is " + Long.toString(account.getBalance()));
     logger.info("before energy limit is " + Long.toString(energyLimit));
     logger.info("before energy usage is " + Long.toString(energyUsage));
-    String filePath = "./src/test/resources/soliditycode/contractScenario007.sol";
     String contractName = "ERC721Token";
-    HashMap retMap = PublicMethed.getBycodeAbi(filePath, contractName);
 
-    String code = retMap.get("byteCode").toString();
-    String abi = retMap.get("abI").toString();
+    String code = Configuration.getByPath("testng.conf")
+        .getString("code.code_ContractScenario007_deployErc721CardMigration");
+    String abi = Configuration.getByPath("testng.conf")
+        .getString("abi.abi_ContractScenario007_deployErc721CardMigration");
     byte[] contractAddress = PublicMethed.deployContract(contractName, abi, code, "", maxFeeLimit,
         0L, 100, null, contract007Key, contract007Address, blockingStubFull);
     PublicMethed.waitProduceNextBlock(blockingStubFull);

framework/src/test/resources/soliditycode/contractScenario005.sol

@@ -92,7 +92,7 @@ contract Crowdsale {
         }
 
         if (fundingGoalReached && beneficiary == msg.sender) {
-            if (address(beneficiary).send(amountRaised)) {
+            if (payable(beneficiary).send(amountRaised)) {
                 emit FundTransfer(beneficiary, amountRaised, false);
             } else {
                 //If we fail to send the funds to beneficiary, unlock funders balance