diff --git a/framework/src/main/java/org/tron/core/services/http/solidity/SolidityNodeHttpApiService.java b/framework/src/main/java/org/tron/core/services/http/solidity/SolidityNodeHttpApiService.java index a1808b4fa86..0c66b220e09 100644 --- a/framework/src/main/java/org/tron/core/services/http/solidity/SolidityNodeHttpApiService.java +++ b/framework/src/main/java/org/tron/core/services/http/solidity/SolidityNodeHttpApiService.java @@ -22,6 +22,7 @@ import org.tron.core.services.http.GetAssetIssueListByNameServlet; import org.tron.core.services.http.GetAssetIssueListServlet; import org.tron.core.services.http.GetAvailableUnfreezeCountServlet; +import org.tron.core.services.http.GetBandwidthPricesServlet; import org.tron.core.services.http.GetBlockByIdServlet; import org.tron.core.services.http.GetBlockByLatestNumServlet; import org.tron.core.services.http.GetBlockByLimitNextServlet; @@ -35,6 +36,7 @@ import org.tron.core.services.http.GetDelegatedResourceAccountIndexV2Servlet; import org.tron.core.services.http.GetDelegatedResourceServlet; import org.tron.core.services.http.GetDelegatedResourceV2Servlet; +import org.tron.core.services.http.GetEnergyPricesServlet; import org.tron.core.services.http.GetExchangeByIdServlet; import org.tron.core.services.http.GetMarketOrderByAccountServlet; import org.tron.core.services.http.GetMarketOrderByIdServlet; @@ -66,7 +68,6 @@ public class SolidityNodeHttpApiService extends HttpService { @Autowired private GetAccountServlet getAccountServlet; - @Autowired private GetTransactionByIdSolidityServlet getTransactionByIdServlet; @Autowired @@ -91,7 +92,6 @@ public class SolidityNodeHttpApiService extends HttpService { private GetExchangeByIdServlet getExchangeByIdServlet; @Autowired private ListExchangesServlet listExchangesServlet; - @Autowired private ListWitnessesServlet listWitnessesServlet; @Autowired @@ -154,15 +154,16 @@ public class SolidityNodeHttpApiService extends HttpService { private TriggerConstantContractServlet triggerConstantContractServlet; @Autowired private EstimateEnergyServlet estimateEnergyServlet; - @Autowired private GetTransactionInfoByBlockNumServlet getTransactionInfoByBlockNumServlet; - @Autowired private HttpApiAccessFilter httpApiAccessFilter; - @Autowired private GetBlockServlet getBlockServlet; + @Autowired + private GetBandwidthPricesServlet getBandwidthPricesServlet; + @Autowired + private GetEnergyPricesServlet getEnergyPricesServlet; @Override @@ -279,6 +280,10 @@ public void start() { context.addServlet(new ServletHolder(getRewardServlet), "/walletsolidity/getReward"); context.addServlet(new ServletHolder(getBurnTrxServlet), "/walletsolidity/getburntrx"); context.addServlet(new ServletHolder(getBlockServlet), "/walletsolidity/getblock"); + context.addServlet(new ServletHolder(getBandwidthPricesServlet), + "/walletsolidity/getbandwidthprices"); + context.addServlet(new ServletHolder(getEnergyPricesServlet), + "/walletsolidity/getenergyprices"); // http access filter context.addFilter(new FilterHolder(httpApiAccessFilter), "/walletsolidity/*", diff --git a/framework/src/test/java/org/tron/program/SolidityNodeTest.java b/framework/src/test/java/org/tron/program/SolidityNodeTest.java index 3ec8959e821..a77fa2fa8c6 100755 --- a/framework/src/test/java/org/tron/program/SolidityNodeTest.java +++ b/framework/src/test/java/org/tron/program/SolidityNodeTest.java @@ -13,6 +13,7 @@ import org.tron.core.Constant; import org.tron.core.config.args.Args; import org.tron.core.services.RpcApiService; +import org.tron.core.services.http.solidity.SolidityNodeHttpApiService; import org.tron.protos.Protocol.Block; import org.tron.protos.Protocol.DynamicProperties; @@ -21,6 +22,8 @@ public class SolidityNodeTest extends BaseTest { @Resource RpcApiService rpcApiService; + @Resource + SolidityNodeHttpApiService solidityNodeHttpApiService; static { try { @@ -94,4 +97,11 @@ public void testSolidityGrpcCall() { rpcApiService.stop(); } + @Test + public void testSolidityNodeHttpApiService() { + solidityNodeHttpApiService.init(Args.getInstance()); + solidityNodeHttpApiService.start(); + solidityNodeHttpApiService.stop(); + Assert.assertTrue(true); + } }