From 0d3dd7e8d80bfee27d9223e347e262dd84ea0426 Mon Sep 17 00:00:00 2001
From: Brian Johnson <johnsonb@objectcomputing.com>
Date: Fri, 20 Apr 2018 14:47:21 -0500
Subject: [PATCH] Fixed abi not matching struct and fixed tests. GH #2257

---
 contracts/eosio.system/eosio.system.abi | 12 ++++++------
 tests/chain_tests/bootseq_tests.cpp     |  6 +++---
 tests/wasm_tests/eosio.system_tests.cpp | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/contracts/eosio.system/eosio.system.abi b/contracts/eosio.system/eosio.system.abi
index 62132e6a3..e353e6128 100644
--- a/contracts/eosio.system/eosio.system.abi
+++ b/contracts/eosio.system/eosio.system.abi
@@ -42,9 +42,9 @@
       "fields": [
          {"name":"from", "type":"account_name"},
          {"name":"receiver", "type":"account_name"},
-         {"name":"stake_net", "type":"asset"},
-         {"name":"stake_cpu", "type":"asset"},
-         {"name":"stake_storage", "type":"asset"}
+         {"name":"stake_net_quantity", "type":"asset"},
+         {"name":"stake_cpu_quantity", "type":"asset"},
+         {"name":"stake_storage_quantity", "type":"asset"}
       ]
     },{
       "name": "undelegatebw",
@@ -52,9 +52,9 @@
       "fields": [
          {"name":"from", "type":"account_name"},
          {"name":"receiver", "type":"account_name"},
-         {"name":"unstake_net", "type":"asset"},
-         {"name":"unstake_cpu", "type":"asset"},
-         {"name":"unstake_bytes", "type":"uint64"}
+         {"name":"unstake_net_quantity", "type":"asset"},
+         {"name":"unstake_cpu_quantity", "type":"asset"},
+         {"name":"unstake_storage_bytes", "type":"uint64"}
       ]
     },{
       "name": "refund",
diff --git a/tests/chain_tests/bootseq_tests.cpp b/tests/chain_tests/bootseq_tests.cpp
index 8dba47a43..418f228eb 100644
--- a/tests/chain_tests/bootseq_tests.cpp
+++ b/tests/chain_tests/bootseq_tests.cpp
@@ -99,9 +99,9 @@ public:
         return push_action( name(from), name(from), N(delegatebw), mvo()
                 ("from",     from)
                 ("receiver", to)
-                ("stake_net", net)
-                ("stake_cpu", cpu)
-                ("stake_storage", storage)
+                ("stake_net_quantity", net)
+                ("stake_cpu_quantity", cpu)
+                ("stake_storage_quantity", storage)
         );
     }
 #if _READY
diff --git a/tests/wasm_tests/eosio.system_tests.cpp b/tests/wasm_tests/eosio.system_tests.cpp
index 2663c0bff..4321974d2 100644
--- a/tests/wasm_tests/eosio.system_tests.cpp
+++ b/tests/wasm_tests/eosio.system_tests.cpp
@@ -77,9 +77,9 @@ public:
       return push_action( name(from), N(delegatebw), mvo()
                           ("from",     from)
                           ("receiver", to)
-                          ("stake_net", net)
-                          ("stake_cpu", cpu)
-                          ("stake_storage", storage)
+                          ("stake_net_quantity", net)
+                          ("stake_cpu_quantity", cpu)
+                          ("stake_storage_quantity", storage)
       );
    }
 
@@ -91,9 +91,9 @@ public:
       return push_action( name(from), N(undelegatebw), mvo()
                           ("from",     from)
                           ("receiver", to)
-                          ("unstake_net", net)
-                          ("unstake_cpu", cpu)
-                          ("unstake_bytes", bytes)
+                          ("unstake_net_quantity", net)
+                          ("unstake_cpu_quantity", cpu)
+                          ("unstake_storage_bytes", bytes)
       );
    }
 
-- 
GitLab