From 66ab805458110990d9dc21faa69e9bfc018c7f3b Mon Sep 17 00:00:00 2001 From: Nathan Hourt Date: Thu, 18 Jun 2015 16:11:29 -0400 Subject: [PATCH] Close #56 --- libraries/chain/asset_evaluator.cpp | 2 +- libraries/chain/fork_database.cpp | 5 ++--- libraries/chain/include/graphene/chain/fork_database.hpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/chain/asset_evaluator.cpp b/libraries/chain/asset_evaluator.cpp index cad49955..3da104aa 100644 --- a/libraries/chain/asset_evaluator.cpp +++ b/libraries/chain/asset_evaluator.cpp @@ -370,7 +370,7 @@ void_result asset_publish_feeds_evaluator::do_evaluate(const asset_publish_feed_ FC_ASSERT(base.is_market_issued()); const asset_bitasset_data_object& bitasset = base.bitasset_data(d); - FC_ASSERT(bitasset.options.short_backing_asset == o.feed.settlement_price.quote.asset_id); + FC_ASSERT(o.feed.settlement_price.quote.asset_id == bitasset.options.short_backing_asset); //Verify that the publisher is authoritative to publish a feed if( base.issuer == account_id_type() ) { diff --git a/libraries/chain/fork_database.cpp b/libraries/chain/fork_database.cpp index c81e1350..11c91c5c 100644 --- a/libraries/chain/fork_database.cpp +++ b/libraries/chain/fork_database.cpp @@ -40,10 +40,9 @@ void fork_database::start_block( signed_block b ) _head = item; } -shared_ptr fork_database::push_block( signed_block b ) +shared_ptr fork_database::push_block( const signed_block& b ) { - auto item = std::make_shared( std::move(b) ); - //wdump((item->num)(_head?_head->num:0)); + auto item = std::make_shared( b ); if( _head && b.previous != block_id_type() ) { diff --git a/libraries/chain/include/graphene/chain/fork_database.hpp b/libraries/chain/include/graphene/chain/fork_database.hpp index 3df28683..4567b56e 100644 --- a/libraries/chain/include/graphene/chain/fork_database.hpp +++ b/libraries/chain/include/graphene/chain/fork_database.hpp @@ -69,7 +69,7 @@ namespace graphene { namespace chain { bool is_known_block( const block_id_type& id )const; shared_ptr fetch_block( const block_id_type& id )const; vector fetch_block_by_number( uint32_t n )const; - shared_ptr push_block( signed_block b ); + shared_ptr push_block(const signed_block& b ); shared_ptr head()const { return _head; } void pop_block();