feat(api): add resource price API for solidity and PBFT

framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServlet.java

@@ -0,0 +1,27 @@
+package org.tron.core.services.interfaceOnPBFT.http;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.tron.core.services.http.GetBandwidthPricesServlet;
+import org.tron.core.services.interfaceOnPBFT.WalletOnPBFT;
+
+@Component
+@Slf4j(topic = "API")
+public class GetBandwidthPricesOnPBFTServlet extends GetBandwidthPricesServlet {
+
+  @Autowired
+  private WalletOnPBFT walletOnPBFT;
+
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response) {
+    walletOnPBFT.futureGet(() -> super.doGet(request, response));
+  }
+
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response) {
+    walletOnPBFT.futureGet(() -> super.doPost(request, response));
+  }
+}

framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServlet.java

@@ -8,18 +8,19 @@
 import org.tron.core.services.http.GetEnergyPricesServlet;
 import org.tron.core.services.interfaceOnPBFT.WalletOnPBFT;
 
-
 @Component
 @Slf4j(topic = "API")
 public class GetEnergyPricesOnPBFTServlet extends GetEnergyPricesServlet {
 
   @Autowired
   private WalletOnPBFT walletOnPBFT;
 
+  @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     walletOnPBFT.futureGet(() -> super.doGet(request, response));
   }
 
+  @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {
     walletOnPBFT.futureGet(() -> super.doPost(request, response));
   }

framework/src/main/java/org/tron/core/services/interfaceOnPBFT/http/PBFT/HttpApiOnPBFTService.java

@@ -22,6 +22,7 @@
 import org.tron.core.services.interfaceOnPBFT.http.GetAssetIssueListByNameOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetAssetIssueListOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetAvailableUnfreezeCountOnPBFTServlet;
+import org.tron.core.services.interfaceOnPBFT.http.GetBandwidthPricesOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetBlockByIdOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetBlockByLatestNumOnPBFTServlet;
 import org.tron.core.services.interfaceOnPBFT.http.GetBlockByLimitNextOnPBFTServlet;
@@ -156,6 +157,8 @@ public class HttpApiOnPBFTService implements Service {
   @Autowired
   private GetBurnTrxOnPBFTServlet getBurnTrxOnPBFTServlet;
   @Autowired
+  private GetBandwidthPricesOnPBFTServlet getBandwidthPricesOnPBFTServlet;
+  @Autowired
   private GetEnergyPricesOnPBFTServlet getEnergyPricesOnPBFTServlet;
 
   @Autowired
@@ -258,6 +261,8 @@ public void start() {
           "/isshieldedtrc20contractnotespent");
       context.addServlet(new ServletHolder(getBurnTrxOnPBFTServlet),
           "/getburntrx");
+      context.addServlet(new ServletHolder(getBandwidthPricesOnPBFTServlet),
+          "/getbandwidthprices");
       context.addServlet(new ServletHolder(getEnergyPricesOnPBFTServlet),
           "/getenergyprices");
       context.addServlet(new ServletHolder(getBlockOnPBFTServlet),

framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServlet.java

@@ -0,0 +1,28 @@
+package org.tron.core.services.interfaceOnSolidity.http;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.tron.core.services.http.GetBandwidthPricesServlet;
+import org.tron.core.services.interfaceOnSolidity.WalletOnSolidity;
+
+@Component
+@Slf4j(topic = "API")
+public class GetBandwidthPricesOnSolidityServlet extends GetBandwidthPricesServlet {
+
+  @Autowired
+  private WalletOnSolidity walletOnSolidity;
+
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response) {
+    walletOnSolidity.futureGet(() -> super.doGet(request, response));
+  }
+
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response) {
+    walletOnSolidity.futureGet(() -> super.doPost(request, response));
+  }
+}
+

framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/GetEnergyPricesOnSolidityServlet.java

@@ -8,18 +8,19 @@
 import org.tron.core.services.http.GetEnergyPricesServlet;
 import org.tron.core.services.interfaceOnSolidity.WalletOnSolidity;
 
-
 @Component
 @Slf4j(topic = "API")
 public class GetEnergyPricesOnSolidityServlet extends GetEnergyPricesServlet {
 
   @Autowired
   private WalletOnSolidity walletOnSolidity;
 
+  @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     walletOnSolidity.futureGet(() -> super.doGet(request, response));
   }
 
+  @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {
     walletOnSolidity.futureGet(() -> super.doPost(request, response));
   }

framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/solidity/HttpApiOnSolidityService.java

@@ -22,6 +22,7 @@
 import org.tron.core.services.interfaceOnSolidity.http.GetAssetIssueListByNameOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetAssetIssueListOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetAvailableUnfreezeCountOnSolidityServlet;
+import org.tron.core.services.interfaceOnSolidity.http.GetBandwidthPricesOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetBlockByIdOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetBlockByLatestNumOnSolidityServlet;
 import org.tron.core.services.interfaceOnSolidity.http.GetBlockByLimitNextOnSolidityServlet;
@@ -168,6 +169,8 @@ public class HttpApiOnSolidityService implements Service {
   @Autowired
   private GetMarketPairListOnSolidityServlet getMarketPairListOnSolidityServlet;
   @Autowired
+  private GetBandwidthPricesOnSolidityServlet getBandwidthPricesOnSolidityServlet;
+  @Autowired
   private GetEnergyPricesOnSolidityServlet getEnergyPricesOnSolidityServlet;
 
   @Autowired
@@ -290,6 +293,8 @@ public void start() {
       context.addServlet(new ServletHolder(getRewardServlet), "/walletsolidity/getReward");
       context
           .addServlet(new ServletHolder(getBurnTrxOnSolidityServlet), "/walletsolidity/getburntrx");
+      context.addServlet(new ServletHolder(getBandwidthPricesOnSolidityServlet),
+          "/walletsolidity/getbandwidthprices");
       context.addServlet(new ServletHolder(getEnergyPricesOnSolidityServlet),
           "/walletsolidity/getenergyprices");
 

framework/src/test/java/org/tron/common/BaseTest.java

@@ -37,10 +37,12 @@ public abstract class BaseTest {
   @AfterClass
   public static void destroy() {
     Args.clearParam();
-    if (StringUtils.isNotEmpty(dbPath) && FileUtil.deleteDir(new File(dbPath))) {
-      logger.info("Release resources successful.");
-    } else {
-      logger.info("Release resources failure.");
+    if (StringUtils.isNotEmpty(dbPath)) {
+      if (FileUtil.deleteDir(new File(dbPath))) {
+        logger.info("Release resources successful.");
+      } else {
+        logger.info("Release resources failure.");
+      }
     }
   }
 

framework/src/test/java/org/tron/common/utils/client/utils/HttpMethed.java

@@ -23,6 +23,7 @@
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.util.EntityUtils;
 import org.junit.Assert;
+import org.springframework.mock.web.MockHttpServletRequest;
 import org.tron.api.GrpcAPI;
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.ByteUtil;
@@ -4876,4 +4877,11 @@ public static HttpResponse getTransactionFromPending(String httpNode, String txi
     }
     return response;
   }
+
+  public static MockHttpServletRequest createRequest(String method) {
+    MockHttpServletRequest request = new MockHttpServletRequest();
+    request.setMethod(method);
+    request.setCharacterEncoding("UTF-8");
+    return request;
+  }
 }

framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetBandwidthPricesOnPBFTServletTest.java

@@ -0,0 +1,62 @@
+package org.tron.core.services.interfaceOnPBFT.http;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.tron.common.utils.client.utils.HttpMethed.createRequest;
+
+import com.alibaba.fastjson.JSONObject;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import javax.annotation.Resource;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.tron.common.BaseTest;
+import org.tron.core.Constant;
+import org.tron.core.config.args.Args;
+
+public class GetBandwidthPricesOnPBFTServletTest extends BaseTest {
+
+  @ClassRule
+  public static final TemporaryFolder temporaryFolder = new TemporaryFolder();
+  @Resource
+  private GetBandwidthPricesOnPBFTServlet getBandwidthPricesOnPBFTServlet;
+
+  @BeforeClass
+  public static void init() throws IOException {
+    Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF);
+  }
+
+  @Test
+  public void testGet() {
+    MockHttpServletRequest request = createRequest(HttpGet.METHOD_NAME);
+    MockHttpServletResponse response = new MockHttpServletResponse();
+    getBandwidthPricesOnPBFTServlet.doPost(request, response);
+    try {
+      String contentAsString = response.getContentAsString();
+      JSONObject result = JSONObject.parseObject(contentAsString);
+      assertTrue(result.containsKey("prices"));
+    } catch (UnsupportedEncodingException e) {
+      fail(e.getMessage());
+    }
+  }
+
+  @Test
+  public void testPost() {
+    MockHttpServletRequest request = createRequest(HttpPost.METHOD_NAME);
+    try {
+      MockHttpServletResponse response = new MockHttpServletResponse();
+      getBandwidthPricesOnPBFTServlet.doPost(request, response);
+      String contentAsString = response.getContentAsString();
+      JSONObject result = JSONObject.parseObject(contentAsString);
+      assertTrue(result.containsKey("prices"));
+    } catch (UnsupportedEncodingException e) {
+      fail(e.getMessage());
+    }
+  }
+}

framework/src/test/java/org/tron/core/services/interfaceOnPBFT/http/GetEnergyPricesOnPBFTServletTest.java

@@ -0,0 +1,62 @@
+package org.tron.core.services.interfaceOnPBFT.http;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.tron.common.utils.client.utils.HttpMethed.createRequest;
+
+import com.alibaba.fastjson.JSONObject;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import javax.annotation.Resource;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.tron.common.BaseTest;
+import org.tron.core.Constant;
+import org.tron.core.config.args.Args;
+
+public class GetEnergyPricesOnPBFTServletTest extends BaseTest {
+
+  @ClassRule
+  public static final TemporaryFolder temporaryFolder = new TemporaryFolder();
+  @Resource
+  private GetEnergyPricesOnPBFTServlet getEnergyPricesOnPBFTServlet;
+
+  @BeforeClass
+  public static void init() throws IOException {
+    Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF);
+  }
+
+  @Test
+  public void testGet() {
+    MockHttpServletRequest request = createRequest(HttpGet.METHOD_NAME);
+    MockHttpServletResponse response = new MockHttpServletResponse();
+    getEnergyPricesOnPBFTServlet.doPost(request, response);
+    try {
+      String contentAsString = response.getContentAsString();
+      JSONObject result = JSONObject.parseObject(contentAsString);
+      assertTrue(result.containsKey("prices"));
+    } catch (UnsupportedEncodingException e) {
+      fail(e.getMessage());
+    }
+  }
+
+  @Test
+  public void testPost() {
+    MockHttpServletRequest request = createRequest(HttpPost.METHOD_NAME);
+    try {
+      MockHttpServletResponse response = new MockHttpServletResponse();
+      getEnergyPricesOnPBFTServlet.doPost(request, response);
+      String contentAsString = response.getContentAsString();
+      JSONObject result = JSONObject.parseObject(contentAsString);
+      assertTrue(result.containsKey("prices"));
+    } catch (UnsupportedEncodingException e) {
+      fail(e.getMessage());
+    }
+  }
+}

framework/src/test/java/org/tron/core/services/interfaceOnSolidity/http/GetBandwidthPricesOnSolidityServletTest.java

@@ -0,0 +1,62 @@
+package org.tron.core.services.interfaceOnSolidity.http;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.tron.common.utils.client.utils.HttpMethed.createRequest;
+
+import com.alibaba.fastjson.JSONObject;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import javax.annotation.Resource;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.tron.common.BaseTest;
+import org.tron.core.Constant;
+import org.tron.core.config.args.Args;
+
+public class GetBandwidthPricesOnSolidityServletTest extends BaseTest {
+
+  @ClassRule
+  public static final TemporaryFolder temporaryFolder = new TemporaryFolder();
+  @Resource
+  private GetBandwidthPricesOnSolidityServlet getBandwidthPricesOnSolidityServlet;
+
+  @BeforeClass
+  public static void init() throws IOException {
+    Args.setParam(new String[]{"-d", temporaryFolder.newFolder().toString()}, Constant.TEST_CONF);
+  }
+
+  @Test
+  public void testGet() {
+    MockHttpServletRequest request = createRequest(HttpGet.METHOD_NAME);
+    MockHttpServletResponse response = new MockHttpServletResponse();
+    getBandwidthPricesOnSolidityServlet.doPost(request, response);
+    try {
+      String contentAsString = response.getContentAsString();
+      JSONObject result = JSONObject.parseObject(contentAsString);
+      assertTrue(result.containsKey("prices"));
+    } catch (UnsupportedEncodingException e) {
+      fail(e.getMessage());
+    }
+  }
+
+  @Test
+  public void testPost() {
+    MockHttpServletRequest request = createRequest(HttpPost.METHOD_NAME);
+    try {
+      MockHttpServletResponse response = new MockHttpServletResponse();
+      getBandwidthPricesOnSolidityServlet.doPost(request, response);
+      String contentAsString = response.getContentAsString();
+      JSONObject result = JSONObject.parseObject(contentAsString);
+      assertTrue(result.containsKey("prices"));
+    } catch (UnsupportedEncodingException e) {
+      fail(e.getMessage());
+    }
+  }
+}