escrow_release_operation tests #143

steemit · Aug 18, 2016 · 100acb4 · 100acb4
1 parent 8201322
commit 100acb4
Show file tree

Hide file tree

Showing 4 changed files with 520 additions and 11 deletions.
diff --git a/libraries/chain/include/steemit/chain/protocol/steem_operations.hpp b/libraries/chain/include/steemit/chain/protocol/steem_operations.hpp
@@ -277,7 +277,7 @@ namespace steemit { namespace chain {
       string         agent;
       string         who; // Either to or agent
       uint32_t       escrow_id = 0;
-      bool           approve;
+      bool           approve = true;
 
       void validate()const;
       void get_required_active_authorities( flat_set<string>& a )const{ a.insert(who); }

diff --git a/libraries/chain/protocol/steem_operations.cpp b/libraries/chain/protocol/steem_operations.cpp
@@ -325,7 +325,7 @@ namespace steemit { namespace chain {
       FC_ASSERT( sbd_amount.amount >= 0, "sbd amount cannot be negative" );
       FC_ASSERT( steem_amount.amount >= 0, "steem amount cannot be negative" );
       FC_ASSERT( sbd_amount.amount > 0 || steem_amount.amount > 0, "escrow must release a non-zero amount" );
-      FC_ASSERT( sbd_amount.symbol == VESTS_SYMBOL, "sbd amount must contain SBD" );
+      FC_ASSERT( sbd_amount.symbol == SBD_SYMBOL, "sbd amount must contain SBD" );
       FC_ASSERT( steem_amount.symbol == STEEM_SYMBOL, "steem amount must contain STEEM" );
    }
 

diff --git a/libraries/chain/steem_evaluator.cpp b/libraries/chain/steem_evaluator.cpp
@@ -610,16 +610,21 @@ void escrow_release_evaluator::do_apply( const escrow_release_operation& o )
       {
          FC_ASSERT( o.who == e.agent, "'agent' must release funds for a disputed escrow" );
       }
-      else if( e.escrow_expiration > db().head_block_time() )
+      else
       {
-         // If there is no dispute and escrow has not expired, either party can release funds to the other.
-         if( o.who == e.from )
-         {
-            FC_ASSERT( o.to == e.to, "'from' must release funds to 'to'" );
-         }
-         else if( o.who == e.to )
+         FC_ASSERT( o.who == e.from || o.who == e.to, "Only 'from' and 'to' can release from a non-disputed escrow" );
+
+         if( e.escrow_expiration > db().head_block_time() )
          {
-            FC_ASSERT( o.to == e.from, "'to' must release funds to 'from'" );
+            // If there is no dispute and escrow has not expired, either party can release funds to the other.
+            if( o.who == e.from )
+            {
+               FC_ASSERT( o.to == e.to, "'from' must release funds to 'to'" );
+            }
+            else if( o.who == e.to )
+            {
+               FC_ASSERT( o.to == e.from, "'to' must release funds to 'from'" );
+            }
          }
       }
       // If escrow expires and there is no dispute, either party can release funds to either party.