Increase tests log_level, some cleanup

.gitlab-ci.yml

@@ -30,8 +30,8 @@ test:
   dependencies:
     - build
   script:
-    - ./build/tests/betting_test --log_level=message
+    - ./build/tests/betting_test --log_level=all
-    - ./build/tests/chain_test --log_level=message
+    - ./build/tests/chain_test --log_level=all
-    - ./build/tests/cli_test --log_level=message
+    - ./build/tests/cli_test --log_level=all
   tags:
     - builder

libraries/chain/db_getter.cpp

@@ -31,9 +31,9 @@
 #include <graphene/chain/custom_account_authority_object.hpp>
 #include <graphene/chain/offer_object.hpp>
 #include <graphene/chain/account_role_object.hpp>
-
 #include <graphene/chain/son_object.hpp>
 #include <graphene/chain/son_proposal_object.hpp>
+
 #include <fc/smart_ref_impl.hpp>
 
 #include <ctime>

libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp

@@ -148,30 +148,6 @@ namespace graphene { namespace chain {
       inline account_id_type sweeps_vesting_accumulator_account()const {
          return extensions.value.sweeps_vesting_accumulator_account.valid() ? *extensions.value.sweeps_vesting_accumulator_account : SWEEPS_ACCUMULATOR_ACCOUNT;
       }
-      inline uint32_t son_vesting_amount()const {
-         return extensions.value.son_vesting_amount.valid() ? *extensions.value.son_vesting_amount : SON_VESTING_AMOUNT; /// current period start date
-      }
-      inline uint32_t son_vesting_period()const {
-         return extensions.value.son_vesting_period.valid() ? *extensions.value.son_vesting_period : SON_VESTING_PERIOD; /// current period start date
-      }
-      inline uint16_t son_pay_max()const {
-         return extensions.value.son_pay_max.valid() ? *extensions.value.son_pay_max : SON_PAY_MAX;
-      }
-      inline uint16_t son_pay_time()const {
-         return extensions.value.son_pay_time.valid() ? *extensions.value.son_pay_time : SON_PAY_TIME;
-      }
-      inline uint16_t son_deregister_time()const {
-         return extensions.value.son_deregister_time.valid() ? *extensions.value.son_deregister_time : SON_DEREGISTER_TIME;
-      }
-      inline uint16_t son_heartbeat_frequency()const {
-         return extensions.value.son_heartbeat_frequency.valid() ? *extensions.value.son_heartbeat_frequency : SON_HEARTBEAT_FREQUENCY;
-      }
-      inline uint16_t son_down_time()const {
-         return extensions.value.son_down_time.valid() ? *extensions.value.son_down_time : SON_DOWN_TIME;
-      }
-      inline uint16_t son_bitcoin_min_tx_confirmations()const {
-         return extensions.value.son_bitcoin_min_tx_confirmations.valid() ? *extensions.value.son_bitcoin_min_tx_confirmations : SON_BITCOIN_MIN_TX_CONFIRMATIONS;
-      }
       inline uint32_t gpos_period()const {
          return extensions.value.gpos_period.valid() ? *extensions.value.gpos_period : GPOS_PERIOD; /// total seconds of current gpos period
       }
@@ -199,6 +175,30 @@ namespace graphene { namespace chain {
       inline uint32_t account_roles_max_lifetime()const {
          return extensions.value.account_roles_max_lifetime.valid() ? *extensions.value.account_roles_max_lifetime : ACCOUNT_ROLES_MAX_LIFETIME;
       }
+      inline uint32_t son_vesting_amount()const {
+         return extensions.value.son_vesting_amount.valid() ? *extensions.value.son_vesting_amount : SON_VESTING_AMOUNT; /// current period start date
+      }
+      inline uint32_t son_vesting_period()const {
+         return extensions.value.son_vesting_period.valid() ? *extensions.value.son_vesting_period : SON_VESTING_PERIOD; /// current period start date
+      }
+      inline uint16_t son_pay_max()const {
+         return extensions.value.son_pay_max.valid() ? *extensions.value.son_pay_max : SON_PAY_MAX;
+      }
+      inline uint16_t son_pay_time()const {
+         return extensions.value.son_pay_time.valid() ? *extensions.value.son_pay_time : SON_PAY_TIME;
+      }
+      inline uint16_t son_deregister_time()const {
+         return extensions.value.son_deregister_time.valid() ? *extensions.value.son_deregister_time : SON_DEREGISTER_TIME;
+      }
+      inline uint16_t son_heartbeat_frequency()const {
+         return extensions.value.son_heartbeat_frequency.valid() ? *extensions.value.son_heartbeat_frequency : SON_HEARTBEAT_FREQUENCY;
+      }
+      inline uint16_t son_down_time()const {
+         return extensions.value.son_down_time.valid() ? *extensions.value.son_down_time : SON_DOWN_TIME;
+      }
+      inline uint16_t son_bitcoin_min_tx_confirmations()const {
+         return extensions.value.son_bitcoin_min_tx_confirmations.valid() ? *extensions.value.son_bitcoin_min_tx_confirmations : SON_BITCOIN_MIN_TX_CONFIRMATIONS;
+      }
       inline account_id_type son_account() const {
          return extensions.value.son_account.valid() ? *extensions.value.son_account : GRAPHENE_NULL_ACCOUNT;
       }

libraries/chain/include/graphene/chain/protocol/vesting.hpp

@@ -34,7 +34,7 @@ namespace graphene { namespace chain {
          case vesting_balance_type::normal:
             return "NORMAL";
          case vesting_balance_type::son:
-            return "SON";   
+            return "SON";
          case vesting_balance_type::gpos:
          default:
             return "GPOS";

libraries/chain/include/graphene/chain/sidechain_transaction_evaluator.hpp

@@ -40,4 +40,4 @@ public:
     object_id_type do_apply(const sidechain_transaction_settle_operation& o);
 };
 
-} } // namespace graphene::chain
+} } // namespace graphene::chain

libraries/wallet/wallet.cpp

@@ -2045,7 +2045,7 @@ public:
          {
             std::string acc_id = account_id_to_string(obj->son_account);
             owners.push_back(acc_id);
-         }            
+         }
       }
       vector< optional< account_object> > accs = _remote_db->get_accounts(owners);
       std::remove_if(son_objects.begin(), son_objects.end(),

tests/cli/son.cpp

@@ -300,7 +300,7 @@ BOOST_FIXTURE_TEST_CASE( select_top_fifteen_sons, cli_fixture )
           con.wallet_api_ptr->transfer(
               "nathan", "sonaccount" + fc::to_pretty_string(i), "1000", "1.3.0", "Here are some CORE tokens for your new account", true );
           con.wallet_api_ptr->create_vesting_balance("sonaccount" + fc::to_pretty_string(i), "500", "1.3.0", vesting_balance_type::gpos, true);
-   
+
           std::string name = "sonaccount" + fc::to_pretty_string(i);
           vote_tx = con.wallet_api_ptr->vote_for_son(name, name, true, true);
       }