Merge pull request EOSIO#33 from EOS-Mainnet/revert-31-dev-1.0.2

Revert "finish the delegated_bandwidth->self_delegated_bandwidth"
activeeos · Jun 9, 2018 · 22957cb · 22957cb
2 parents 2d44208 + 2e59862
commit 22957cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/contracts/eosio.system/delegate_bandwidth.cpp b/contracts/eosio.system/delegate_bandwidth.cpp
@@ -47,7 +47,7 @@ namespace eosiosystem {
    /**
     *  Every user 'from' has a scope/table that uses every receipient 'to' as the primary key.
     */
-   struct self_delegated_bandwidth {
+   struct delegated_bandwidth {
       account_name  from;
       account_name  to;
       asset         net_weight;
@@ -56,7 +56,7 @@ namespace eosiosystem {
       uint64_t  primary_key()const { return to; }
 
       // explicit serialization macro is not necessary, used here only to improve compilation time
-      EOSLIB_SERIALIZE( self_delegated_bandwidth, (from)(to)(net_weight)(cpu_weight) )
+      EOSLIB_SERIALIZE( delegated_bandwidth, (from)(to)(net_weight)(cpu_weight) )
 
    };
 
@@ -77,7 +77,7 @@ namespace eosiosystem {
     *  facilitates simpler API for per-user queries
     */
    typedef eosio::multi_index< N(userres), user_resources>      user_resources_table;
-   typedef eosio::multi_index< N(delband), self_delegated_bandwidth> del_bandwidth_table;
+   typedef eosio::multi_index< N(delband), delegated_bandwidth> del_bandwidth_table;
    typedef eosio::multi_index< N(refunds), refund_request>      refunds_table;
 
 

diff --git a/contracts/eosio.system/eosio.system.abi b/contracts/eosio.system/eosio.system.abi
@@ -391,7 +391,7 @@
       ]
     },
     {
-      "name": "self_delegated_bandwidth",
+      "name": "delegated_bandwidth",
       "base": "",
       "fields": [
         {
@@ -1123,7 +1123,7 @@
     },
     {
       "name": "delband",
-      "type": "self_delegated_bandwidth",
+      "type": "delegated_bandwidth",
       "index_type": "i64",
       "key_names": [
         "to"