mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use check for isRegtest instead of test for isDevTesting to set dev parameters

Browse Source 
Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2022-11-17 18:55:02 -05:00
parent 0e79582819
commit 8ab2582db6
No known key found for this signature in database
GPG Key ID: 02AA2BAE387C8307
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/bisq/core/dao/burningman/BurnTargetService.java
View File

@ -31,7 +31,7 @@ import bisq.core.dao.state.model.governance.Issuance;
import bisq.core.dao.state.model.governance.IssuanceType;
import bisq.core.dao.state.model.governance.ReimbursementProposal;
import bisq.common.app.DevEnv;
import bisq.common.config.Config;
import bisq.common.util.Hex;
import javax.inject.Inject;
@ -59,7 +59,7 @@ class BurnTargetService {
// Default value for the estimated BTC trade fees per month as BSQ sat value (100 sat = 1 BSQ).
// Default is roughly average of last 12 months at Nov 2022.
// Can be changed with DAO parameter voting.
private static final long DEFAULT_ESTIMATED_BTC_TRADE_FEE_REVENUE_PER_CYCLE = DevEnv.isDevTesting() ? 1000000 : 6200000;
private static final long DEFAULT_ESTIMATED_BTC_TRADE_FEE_REVENUE_PER_CYCLE = Config.baseCurrencyNetwork().isRegtest() ? 1000000 : 6200000;
private final DaoStateService daoStateService;
private final CyclesInDaoStateService cyclesInDaoStateService;

4
core/src/main/java/bisq/core/dao/burningman/BurningManPresentationService.java
View File

@ -35,7 +35,7 @@ import bisq.core.dao.state.model.governance.Proposal;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.common.app.DevEnv;
import bisq.common.config.Config;
import bisq.common.util.Hex;
import bisq.common.util.Tuple2;
@ -58,7 +58,7 @@ import lombok.extern.slf4j.Slf4j;
public class BurningManPresentationService implements DaoStateListener {
// Burn target gets increased by that amount to give more flexibility.
// Burn target is calculated from reimbursements + estimated BTC fees - burned amounts.
static final long BURN_TARGET_BOOST_AMOUNT = DevEnv.isDevTesting() ? 1000000 : 10000000;
static final long BURN_TARGET_BOOST_AMOUNT = Config.baseCurrencyNetwork().isRegtest() ? 1000000 : 10000000;
public static final String LEGACY_BURNING_MAN_NAME = "Legacy Burningman";
private final DaoStateService daoStateService;

4
core/src/main/java/bisq/core/dao/burningman/BurningManService.java
View File

@ -35,7 +35,7 @@ import bisq.core.dao.state.model.governance.IssuanceType;
import bisq.network.p2p.storage.P2PDataStorage;
import bisq.common.app.DevEnv;
import bisq.common.config.Config;
import bisq.common.util.Utilities;
import javax.inject.Inject;
@ -69,7 +69,7 @@ public class BurningManService {
private static final Date ACTIVATION_DATE = Utilities.getUTCDate(2023, GregorianCalendar.JANUARY, 1);
public static boolean isActivated() {
return DevEnv.isDevTesting() || new Date().after(ACTIVATION_DATE);
return Config.baseCurrencyNetwork().isRegtest() || new Date().after(ACTIVATION_DATE);
}
// Parameters