GH-109 No reason to store expiration

AntelopeIO · Sep 16, 2022 · dfbe904 · dfbe904
1 parent 5564e9c
commit dfbe904
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -32,12 +32,12 @@ using next_func_t = std::function<void(const std::variant<fc::exception_ptr, tra
 
 struct unapplied_transaction {
    const transaction_metadata_ptr trx_meta;
-   const fc::time_point           expiry;
    trx_enum_type                  trx_type = trx_enum_type::unknown;
    bool                           return_failure_trace = false;
    next_func_t                    next;
 
    const transaction_id_type& id()const { return trx_meta->id(); }
+   fc::time_point_sec expiration()const { return trx_meta->packed_trx()->expiration(); }
 
    unapplied_transaction(const unapplied_transaction&) = delete;
    unapplied_transaction() = delete;
@@ -61,7 +61,7 @@ class unapplied_transaction_queue {
                const_mem_fun<unapplied_transaction, const transaction_id_type&, &unapplied_transaction::id>
          >,
          ordered_non_unique< tag<by_type>, member<unapplied_transaction, trx_enum_type, &unapplied_transaction::trx_type> >,
-         ordered_non_unique< tag<by_expiry>, member<unapplied_transaction, const fc::time_point, &unapplied_transaction::expiry> >
+         ordered_non_unique< tag<by_expiry>, const_mem_fun<unapplied_transaction, fc::time_point_sec, &unapplied_transaction::expiration> >
       >
    > unapplied_trx_queue_type;
 
@@ -101,7 +101,7 @@ class unapplied_transaction_queue {
       auto& persisted_by_expiry = queue.get<by_expiry>();
       while( !persisted_by_expiry.empty() ) {
          const auto& itr = persisted_by_expiry.begin();
-         if( itr->expiry > pending_block_time ) {
+         if( itr->expiration() > pending_block_time ) {
             break;
          }
          if( deadline <= fc::time_point::now() ) {
@@ -146,26 +146,23 @@ class unapplied_transaction_queue {
          const block_state_ptr& bsptr = *ritr;
          for( auto itr = bsptr->trxs_metas().begin(), end = bsptr->trxs_metas().end(); itr != end; ++itr ) {
             const auto& trx = *itr;
-            fc::time_point expiry = trx->packed_trx()->expiration();
-            auto insert_itr = queue.insert( { trx, expiry, trx_enum_type::forked } );
+            auto insert_itr = queue.insert( { trx, trx_enum_type::forked } );
             if( insert_itr.second ) added( insert_itr.first );
          }
       }
    }
 
    void add_aborted( deque<transaction_metadata_ptr> aborted_trxs ) {
       for( auto& trx : aborted_trxs ) {
-         fc::time_point expiry = trx->packed_trx()->expiration();
-         auto insert_itr = queue.insert( { std::move( trx ), expiry, trx_enum_type::aborted } );
+         auto insert_itr = queue.insert( { std::move( trx ), trx_enum_type::aborted } );
          if( insert_itr.second ) added( insert_itr.first );
       }
    }
 
    void add_persisted( const transaction_metadata_ptr& trx ) {
       auto itr = queue.get<by_trx_id>().find( trx->id() );
       if( itr == queue.get<by_trx_id>().end() ) {
-         fc::time_point expiry = trx->packed_trx()->expiration();
-         auto insert_itr = queue.insert( { trx, expiry, trx_enum_type::persisted } );
+         auto insert_itr = queue.insert( { trx, trx_enum_type::persisted } );
          if( insert_itr.second ) added( insert_itr.first );
       } else if( itr->trx_type != trx_enum_type::persisted ) {
          if (itr->trx_type == trx_enum_type::incoming || itr->trx_type == trx_enum_type::incoming_persisted)
@@ -180,9 +177,8 @@ class unapplied_transaction_queue {
    void add_incoming( const transaction_metadata_ptr& trx, bool persist_until_expired, bool return_failure_trace, next_func_t next ) {
       auto itr = queue.get<by_trx_id>().find( trx->id() );
       if( itr == queue.get<by_trx_id>().end() ) {
-         fc::time_point expiry = trx->packed_trx()->expiration();
          auto insert_itr = queue.insert(
-               { trx, expiry, persist_until_expired ? trx_enum_type::incoming_persisted : trx_enum_type::incoming, return_failure_trace, std::move( next ) } );
+               { trx, persist_until_expired ? trx_enum_type::incoming_persisted : trx_enum_type::incoming, return_failure_trace, std::move( next ) } );
          if( insert_itr.second ) added( insert_itr.first );
       } else {
          if( itr->trx_meta == trx ) return; // same trx meta pointer