Merge pull request #38 from AntelopeIO/fix_map_abi_generation

[3.0] fix inconsistency in ABI generated for map
AntelopeIO · Sep 23, 2022 · c22f4c7 · c22f4c7
2 parents 5879361 + e8bc581
commit c22f4c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tests/toolchain/abigen-pass/nested_container.abi b/tests/toolchain/abigen-pass/nested_container.abi
@@ -31,11 +31,11 @@
             "base": "",
             "fields": [
                 {
-                    "name": "key",
+                    "name": "first",
                     "type": "string"
                 },
                 {
-                    "name": "value",
+                    "name": "second",
                     "type": "B_map_string_string_E"
                 }
             ]
@@ -45,11 +45,11 @@
             "base": "",
             "fields": [
                 {
-                    "name": "key",
+                    "name": "first",
                     "type": "string"
                 },
                 {
-                    "name": "value",
+                    "name": "second",
                     "type": "string"
                 }
             ]
@@ -107,4 +107,4 @@
     "ricardian_clauses": [],
     "variants": [],
     "action_results": []
-}
+}
diff --git a/tools/include/eosio/abigen.hpp b/tools/include/eosio/abigen.hpp
@@ -178,8 +178,8 @@ namespace eosio { namespace cdt {
             return name.substr(0,i+1);
          };
          map_info.name = remove_ending_brackets(name);
-         map_info.fields.push_back( {"key", get_template_argument_as_string(type)} );
-         map_info.fields.push_back( {"value", get_template_argument_as_string(type, 1)} );
+         map_info.fields.push_back( {"first", get_template_argument_as_string(type)} );
+         map_info.fields.push_back( {"second", get_template_argument_as_string(type, 1)} );
          add_type(std::get<clang::QualType>(get_template_argument(type)));
          add_type(std::get<clang::QualType>(get_template_argument(type, 1)));
          _abi.structs.insert(map_info);
@@ -326,8 +326,8 @@ namespace eosio { namespace cdt {
 
             abi_struct kv;
             kv.name = "pair_" + inside_type_name[0] + "_" + inside_type_name[1];
-            kv.fields.push_back( {"key", inside_type_name[0]} );
-            kv.fields.push_back( {"value", inside_type_name[1]} );
+            kv.fields.push_back( {"first", inside_type_name[0]} );
+            kv.fields.push_back( {"second", inside_type_name[1]} );
             _abi.structs.insert(kv);
 
             gottype = true;