fix http conflict

Pandulis · Jul 24, 2020 · bddfce8 · bddfce8
1 parent e436a3d
commit bddfce8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/framework/src/main/java/org/tron/core/services/http/FullNodeHttpApiService.java b/framework/src/main/java/org/tron/core/services/http/FullNodeHttpApiService.java
@@ -512,8 +512,8 @@ public void start() {
       context.addServlet(new ServletHolder(metricsServlet), "/monitor/getstatsinfo");
       context.addServlet(new ServletHolder(getNodeInfoServlet), "/monitor/getnodeinfo");
 
-      context.addServlet(new ServletHolder(marketSellAssetServlet), "/marketsellasset");
-      context.addServlet(new ServletHolder(marketCancelOrderServlet), "/marketcancelorder");
+      context.addServlet(new ServletHolder(marketSellAssetServlet), "/wallet/marketsellasset");
+      context.addServlet(new ServletHolder(marketCancelOrderServlet), "/wallet/marketcancelorder");
       context.addServlet(new ServletHolder(getMarketOrderByAccountServlet),
           "/wallet/getmarketorderbyaccount");
       context.addServlet(new ServletHolder(getMarketOrderByIdServlet),

diff --git a/framework/src/main/java/org/tron/core/services/http/HttpSelfFormatFieldName.java b/framework/src/main/java/org/tron/core/services/http/HttpSelfFormatFieldName.java
@@ -250,6 +250,9 @@ public class HttpSelfFormatFieldName {
     NameFieldNameMap.put("protocol.MarketSellAssetContract.sell_token_id", 1);
     NameFieldNameMap.put("protocol.MarketSellAssetContract.buy_token_id", 1);
 
+    // MarketCancelOrderServlet
+    AddressFieldNameMap.put("protocol.MarketCancelOrderContract.owner_address", 1);
+
     // MarketOrder
     AddressFieldNameMap.put("protocol.MarketOrder.owner_address", 1);
     NameFieldNameMap.put("protocol.MarketOrder.sell_token_id", 1);