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

fixed config settings

Browse source
This commit is contained in:
Daniel Larimer 2015-06-19 12:11:32 -04:00
parent be5a8c6365
commit 51e6421ea0
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.cpp
View file

@ -123,7 +123,7 @@ namespace graphene { namespace chain {
if( !settlement_price.is_null() ) if( !settlement_price.is_null() )
settlement_price.validate(); settlement_price.validate();
FC_ASSERT( maximum_short_squeeze_ratio >= 1000 ); FC_ASSERT( maximum_short_squeeze_ratio >= 1000 );
FC_ASSERT( maintenance_collateral_ratio >= maximum_short_squeeze_ratio ); FC_ASSERT( maintenance_collateral_ratio <= maximum_short_squeeze_ratio );
} FC_CAPTURE_AND_RETHROW( (*this) ) } } FC_CAPTURE_AND_RETHROW( (*this) ) }
price price_feed::max_short_squeeze_price()const price price_feed::max_short_squeeze_price()const

5
libraries/chain/include/graphene/chain/config.hpp
View file

@ -63,9 +63,8 @@
#define GRAPHENE_MIN_COLLATERAL_RATIO 1001 // lower than this could result in divide by 0 #define GRAPHENE_MIN_COLLATERAL_RATIO 1001 // lower than this could result in divide by 0
#define GRAPHENE_MAX_COLLATERAL_RATIO 32000 // higher than this is unnecessary and may exceed int16 storage #define GRAPHENE_MAX_COLLATERAL_RATIO 32000 // higher than this is unnecessary and may exceed int16 storage
#define GRAPHENE_DEFAULT_INITIAL_COLLATERAL_RATIO 2000 #define GRAPHENE_DEFAULT_MAINTENANCE_COLLATERAL_RATIO 1500 // We require collateral of 1.5x or more
#define GRAPHENE_DEFAULT_MAINTENANCE_COLLATERAL_RATIO 1750 #define GRAPHENE_DEFAULT_MAX_SHORT_SQUEEZE_RATIO 1750 // If there is a squeeze you are protected up to 1.75x... but black swan could occur first
#define GRAPHENE_DEFAULT_MAX_SHORT_SQUEEZE_RATIO 1500
#define GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC (30*60*60*24) #define GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC (30*60*60*24)
#define GRAPHENE_DEFAULT_NUM_WITNESSES (101) #define GRAPHENE_DEFAULT_NUM_WITNESSES (101)

2
tests/tests/operation_tests.cpp
View file

@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE( feed_limit_logic_test )
{ {
try { try {
asset usd(100,1); asset usd(100,1);
asset core(200,1); asset core(100,0);
price_feed feed; price_feed feed;
feed.settlement_price = usd / core; feed.settlement_price = usd / core;