Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Close #56

Browse source
This commit is contained in:
Nathan Hourt 2015-06-18 16:11:29 -04:00
parent ec76179b0b
commit 66ab805458
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/chain/asset_evaluator.cpp
View file

@ -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() )
{

5
libraries/chain/fork_database.cpp
View file

@ -40,10 +40,9 @@ void fork_database::start_block( signed_block b )
_head = item;
}
shared_ptr<fork_item> fork_database::push_block( signed_block b )
shared_ptr<fork_item> fork_database::push_block( const signed_block& b )
{
auto item = std::make_shared<fork_item>( std::move(b) );
//wdump((item->num)(_head?_head->num:0));
auto item = std::make_shared<fork_item>( b );
if( _head && b.previous != block_id_type() )
{

2
libraries/chain/include/graphene/chain/fork_database.hpp
View file

@ -69,7 +69,7 @@ namespace graphene { namespace chain {
bool is_known_block( const block_id_type& id )const;
shared_ptr<fork_item> fetch_block( const block_id_type& id )const;
vector<item_ptr> fetch_block_by_number( uint32_t n )const;
shared_ptr<fork_item> push_block( signed_block b );
shared_ptr<fork_item> push_block(const signed_block& b );
shared_ptr<fork_item> head()const { return _head; }
void pop_block();