From 42260b5532638ece91cf0c5e73ae98413e9961ab Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Mon, 21 Oct 2019 16:02:10 -0300 Subject: [PATCH 1/2] fix build error --- .../chain/include/graphene/chain/protocol/chain_parameters.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp index 61f24cce..c62274ba 100644 --- a/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp +++ b/libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp @@ -134,6 +134,7 @@ namespace graphene { namespace chain { } 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_daily_max()const { return extensions.value.son_pay_daily_max.valid() ? *extensions.value.son_pay_daily_max : MIN_SON_PAY_DAILY_MAX; } From 1b3c790aa6aa8039230e18182305563be62d60bd Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Mon, 21 Oct 2019 17:57:31 -0300 Subject: [PATCH 2/2] adapt son_pay_test to dormant vesting policy --- tests/tests/son_operations_tests.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/tests/son_operations_tests.cpp b/tests/tests/son_operations_tests.cpp index 0d0de848..8d5ae3f2 100644 --- a/tests/tests/son_operations_tests.cpp +++ b/tests/tests/son_operations_tests.cpp @@ -293,7 +293,10 @@ BOOST_AUTO_TEST_CASE( son_pay_test ) vesting_balance_create_operation op; op.creator = alice_id; op.owner = alice_id; - op.amount = asset(10); + op.amount = asset(50*GRAPHENE_BLOCKCHAIN_PRECISION); + op.balance_type = vesting_balance_type::son; + op.policy = dormant_vesting_policy_initializer {}; + trx.operations.push_back(op); for( auto& op : trx.operations ) db.current_fee_schedule().set_fee(op); set_expiration(db, trx); @@ -308,7 +311,9 @@ BOOST_AUTO_TEST_CASE( son_pay_test ) vesting_balance_create_operation op; op.creator = alice_id; op.owner = alice_id; - op.amount = asset(10); + op.amount = asset(1*GRAPHENE_BLOCKCHAIN_PRECISION); + op.balance_type = vesting_balance_type::normal; + trx.operations.push_back(op); for( auto& op : trx.operations ) db.current_fee_schedule().set_fee(op); set_expiration(db, trx); @@ -323,7 +328,10 @@ BOOST_AUTO_TEST_CASE( son_pay_test ) vesting_balance_create_operation op; op.creator = bob_id; op.owner = bob_id; - op.amount = asset(10); + op.amount = asset(50*GRAPHENE_BLOCKCHAIN_PRECISION); + op.balance_type = vesting_balance_type::son; + op.policy = dormant_vesting_policy_initializer {}; + trx.operations.push_back(op); for( auto& op : trx.operations ) db.current_fee_schedule().set_fee(op); set_expiration(db, trx); @@ -338,7 +346,9 @@ BOOST_AUTO_TEST_CASE( son_pay_test ) vesting_balance_create_operation op; op.creator = bob_id; op.owner = bob_id; - op.amount = asset(10); + op.amount = asset(1*GRAPHENE_BLOCKCHAIN_PRECISION); + op.balance_type = vesting_balance_type::normal; + trx.operations.push_back(op); for( auto& op : trx.operations ) db.current_fee_schedule().set_fee(op); set_expiration(db, trx);