Skip to content

fix(api): add resource price query entry for soliditynode #5516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
halibobo1205 merged 1 commit into from
Sep 25, 2023
Merged

fix(api): add resource price query entry for soliditynode #5516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions framework/src/main/java/org/tron/core/services/http/solidity/SolidityNodeHttpApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -66,7 +68,6 @@ public class SolidityNodeHttpApiService extends HttpService {

@Autowired
private GetAccountServlet getAccountServlet;

@Autowired
private GetTransactionByIdSolidityServlet getTransactionByIdServlet;
@Autowired
Expand All @@ -91,7 +92,6 @@ public class SolidityNodeHttpApiService extends HttpService {
private GetExchangeByIdServlet getExchangeByIdServlet;
@Autowired
private ListExchangesServlet listExchangesServlet;

@Autowired
private ListWitnessesServlet listWitnessesServlet;
@Autowired
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/*",
Expand Down
10 changes: 10 additions & 0 deletions framework/src/test/java/org/tron/program/SolidityNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -21,6 +22,8 @@ public class SolidityNodeTest extends BaseTest {

@Resource
RpcApiService rpcApiService;
@Resource
SolidityNodeHttpApiService solidityNodeHttpApiService;

static {
try {
Expand Down Expand Up @@ -94,4 +97,11 @@ public void testSolidityGrpcCall() {
rpcApiService.stop();
}

@Test
public void testSolidityNodeHttpApiService() {
solidityNodeHttpApiService.init(Args.getInstance());
solidityNodeHttpApiService.start();
solidityNodeHttpApiService.stop();
Assert.assertTrue(true);
}
}