put const cast into transaction bucket

JimmyShi22 · Sep 11, 2023 · 6f35e48 · 6f35e48
1 parent aa84fde
commit 6f35e48
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/bcos-txpool/bcos-txpool/txpool/utilities/TransactionBucket.h b/bcos-txpool/bcos-txpool/txpool/utilities/TransactionBucket.h
@@ -45,12 +45,18 @@ class MultiIndexTxContainer
     {
     public:
         IteratorImpl(typename Container::nth_index<0>::type::iterator& it)
-          : first(it->txHash), second(it->transaction), m_iterator(it)
+          : first(it->txHash),
+            // we assume that _transaction is not indexed so we can cast it to non-const
+            second(const_cast<bcos::protocol::Transaction::Ptr&>(it->transaction)),
+            m_iterator(it)
         {}
 
         IteratorImpl(const bcos::crypto::HashType& _first,
             const bcos::protocol::Transaction::Ptr& _transaction)
-          : first(_first), second(_transaction), m_iterator()
+          : first(_first),
+            // we assume that _transaction is not indexed so we can cast it to non-const
+            second(const_cast<bcos::protocol::Transaction::Ptr&>(_transaction)),
+            m_iterator()
         {}
 
         friend bool operator==(
@@ -68,7 +74,7 @@ class MultiIndexTxContainer
         Container::nth_index<0>::type::iterator getIterator() const { return m_iterator; }
 
         const bcos::crypto::HashType& first;
-        const bcos::protocol::Transaction::Ptr& second;
+        bcos::protocol::Transaction::Ptr& second;
 
     private:
         typename Container::nth_index<0>::type::iterator m_iterator;

diff --git a/bcos-utilities/bcos-utilities/BucketMap.h b/bcos-utilities/bcos-utilities/BucketMap.h
@@ -63,7 +63,7 @@ class Bucket : public std::enable_shared_from_this<Bucket<KeyType, ValueType, Ma
         void setValue(typename MapType::iterator it) { m_it = it; };
 
         const KeyType& key() { return m_it->first; }
-        ValueType& value() { return const_cast<ValueType&>(m_it->second); }
+        ValueType& value() { return m_it->second; }
 
     private:
         typename Bucket::Ptr m_bucket;