Merge pull request #5 from toncenter/develop

Changed name of parameter in getConfigParam to correspond to TL schema

Author: kdimentionaltree

ton-http-api/schemas/v2.yaml

@@ -1234,7 +1234,7 @@ paths:
       description: Get blockchain configuration parameter
       operationId: getConfigParam_get
       parameters:
-        - name: config_id
+        - name: param
           in: query
           description: Parameter number
           required: true
@@ -2026,15 +2026,19 @@ components:
     ConfigParamRequest:
       type: object
       additionalProperties: false
-      required:
-        - config_id
       properties:
         config_id:
           oneOf:
             - type: string
             - type: integer
               format: int32
           x-usrv-cpp-type: 'std::int32_t'
+        param:
+          oneOf:
+            - type: string
+            - type: integer
+              format: int32
+          x-usrv-cpp-type: 'std::int32_t'
         seqno:
           oneOf:
             - type: string

ton-http-api/src/handlers/config/GetConfigParamHandler.cpp

@@ -13,11 +13,19 @@ ton_http::schemas::v2::ConfigParamRequest ton_http::handlers::GetConfigParamHand
     const HttpRequest& request, RequestContext&
 ) const {
   schemas::v2::ConfigParamRequest req;
-
-  try {
-    req.config_id = boost::lexical_cast<std::int32_t>(request.GetArg("config_id"));
-  } catch (std::exception& exc) {
-    throw utils::TonlibException("failed to parse config_id", 422);
+  if (request.HasArg("param")) {
+    try {
+      req.param = boost::lexical_cast<std::int32_t>(request.GetArg("param"));
+    } catch (std::exception& exc) {
+      throw utils::TonlibException("failed to parse param", 422);
+    }
+  }
+  if (request.HasArg("config_id")) { // backward compatibility
+    try {
+      req.param = boost::lexical_cast<std::int32_t>(request.GetArg("config_id"));
+    } catch (std::exception& exc) {
+      throw utils::TonlibException("failed to parse config_id", 422);
+    }
   }
   if (request.HasArg("seqno")) {
     try {
@@ -32,7 +40,17 @@ ton_http::schemas::v2::ConfigParamRequest ton_http::handlers::GetConfigParamHand
 td::Status ton_http::handlers::GetConfigParamHandler::ValidateRequest(
     const schemas::v2::ConfigParamRequest& request
 ) const {
-  if (request.config_id < 0) {
+  std::int32_t param = -1;
+  if (!(request.config_id.has_value() ^ request.param.has_value())) {
+    return td::Status::Error(422, "only one of config_id or param should be specified");
+  }
+  if (request.config_id.has_value()) {
+    param = request.config_id.value();
+  }
+  if (request.param.has_value()) {
+    param = request.param.value();
+  }
+  if (param < 0) {
     return td::Status::Error(422, "param should be non-negative");
   }
   if (request.seqno.has_value() && request.seqno.value() <= 0) {
@@ -43,6 +61,7 @@ td::Status ton_http::handlers::GetConfigParamHandler::ValidateRequest(
 td::Result<ton_http::schemas::v2::ConfigInfo> ton_http::handlers::GetConfigParamHandler::HandleRequestTonlibThrow(
     schemas::v2::ConfigParamRequest& request, multiclient::SessionPtr& session
 ) const {
-  TRY_RESULT(result, tonlib_component_.DoRequest(&core::TonlibWorker::getConfigParam, request.config_id, request.seqno, session));
+  auto param = (request.config_id.has_value() ? request.config_id.value() : request.param.has_value() ? request.param.value() : -1);
+  TRY_RESULT(result, tonlib_component_.DoRequest(&core::TonlibWorker::getConfigParam, param, request.seqno, session));
   return converters::Convert(result);
 }

ton-http-api/static/openapi.json

@@ -2183,7 +2183,7 @@
         "operationId": "getConfigParam_get",
         "parameters": [
           {
-            "name": "config_id",
+            "name": "param",
             "in": "query",
             "description": "Parameter number",
             "required": true,
@@ -3450,9 +3450,6 @@
       "ConfigParamRequest": {
         "type": "object",
         "additionalProperties": false,
-        "required": [
-          "config_id"
-        ],
         "properties": {
           "config_id": {
             "oneOf": [
@@ -3466,6 +3463,18 @@
             ],
             "x-usrv-cpp-type": "std::int32_t"
           },
+          "param": {
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "integer",
+                "format": "int32"
+              }
+            ],
+            "x-usrv-cpp-type": "std::int32_t"
+          },
           "seqno": {
             "oneOf": [
               {