From c72888c86dd875fbbffc6a9c76d07ffcbb139efd Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 9 Nov 2017 14:40:01 -0500 Subject: [PATCH] Deable dev mode --- .../main/java/io/bisq/common/app/DevEnv.java | 4 +- .../java/io/bisq/network/p2p/network/a.txt | 82 ------------------ .../java/io/bisq/network/p2p/network/b.txt | 84 ------------------- 3 files changed, 2 insertions(+), 168 deletions(-) delete mode 100644 network/src/main/java/io/bisq/network/p2p/network/a.txt delete mode 100644 network/src/main/java/io/bisq/network/p2p/network/b.txt diff --git a/common/src/main/java/io/bisq/common/app/DevEnv.java b/common/src/main/java/io/bisq/common/app/DevEnv.java index cdf5291695..9878dc6314 100644 --- a/common/src/main/java/io/bisq/common/app/DevEnv.java +++ b/common/src/main/java/io/bisq/common/app/DevEnv.java @@ -10,7 +10,7 @@ public class DevEnv { // peer (click user icon and alt+r), filter/block offers by various data like offer ID (cmd + f). // The user can set a program argument to ignore all of those privileged network_messages. They are intended for // emergency cases only (beside update message and arbitrator registration). - public static final boolean USE_DEV_PRIVILEGE_KEYS = true; + public static final boolean USE_DEV_PRIVILEGE_KEYS = false; public static final String DEV_PRIVILEGE_PUB_KEY = "027a381b5333a56e1cc3d90d3a7d07f26509adf7029ed06fc997c656621f8da1ee"; public static final String DEV_PRIVILEGE_PRIV_KEY = "6ac43ea1df2a290c1c8391736aa42e4339c5cb4f110ff0257a13b63211977b7a"; @@ -18,7 +18,7 @@ public class DevEnv { // If set to true we ignore several UI behavior like confirmation popups as well dummy accounts are created and // offers are filled with default values. Intended to make dev testing faster. @SuppressWarnings("PointlessBooleanExpression") - public static final boolean DEV_MODE = STRESS_TEST_MODE || true; + public static final boolean DEV_MODE = STRESS_TEST_MODE || false; public static final boolean DAO_PHASE2_ACTIVATED = false; } diff --git a/network/src/main/java/io/bisq/network/p2p/network/a.txt b/network/src/main/java/io/bisq/network/p2p/network/a.txt deleted file mode 100644 index d9460b2e74..0000000000 --- a/network/src/main/java/io/bisq/network/p2p/network/a.txt +++ /dev/null @@ -1,82 +0,0 @@ -{ - "offerPayload": { - "id": "bynzq-3dbea64f-8028-4235-bfc7-7b7329bff180-053", - "date": 1510249787501, - "ownerNodeAddress": { - "hostName": "localhost", - "port": 3682 - }, - "direction": "BUY", - "price": 0, - "marketPriceMargin": 0.01, - "useMarketBasedPrice": true, - "amount": 1000000, - "minAmount": 1000000, - "baseCurrencyCode": "BTC", - "counterCurrencyCode": "USD", - "arbitratorNodeAddresses": [ - { - "hostName": "localhost", - "port": 9222 - } - ], - "mediatorNodeAddresses": [ - { - "hostName": "localhost", - "port": 9222 - } - ], - "paymentMethodId": "PERFECT_MONEY", - "makerPaymentAccountId": "619c802d-48ff-40a1-944e-77d5df5623eb", - "offerFeePaymentTxId": "1e5f0c750a8bc91c92cdd2132c916089bafd649b1d288980a65ce8dfdfc9a2ca", - "versionNr": "0.5.3", - "blockHeightAtOfferCreation": 166, - "txFee": 168000, - "makerFee": 20000, - "isCurrencyForMakerFeeBtc": true, - "buyerSecurityDeposit": 3000000, - "sellerSecurityDeposit": 1000000, - "maxTradeLimit": 100000000, - "maxTradePeriod": 86400000, - "useAutoClose": false, - "useReOpenAfterAutoClose": false, - "lowerClosePrice": 0, - "upperClosePrice": 0, - "isPrivateOffer": false, - "protocolVersion": 1 - }, - "tradeAmount": 1000000, - "tradePrice": 71132787, - "takerFeeTxID": "7361ac51789257022dc07189d56a42ad918922fad81d3d074ebf85ebbfdcb3c9", - "buyerNodeAddress": { - "hostName": "localhost", - "port": 3682 - }, - "sellerNodeAddress": { - "hostName": "localhost", - "port": 3632 - }, - "arbitratorNodeAddress": { - "hostName": "localhost", - "port": 9222 - }, - "mediatorNodeAddress": { - "hostName": "localhost", - "port": 9222 - }, - "isBuyerMakerAndSellerTaker": true, - "makerAccountId": "919666446", - "takerAccountId": "1680033503", - "makerPaymentAccountPayload": { - "accountNr": "adsf", - "paymentMethodId": "PERFECT_MONEY", - "id": "619c802d-48ff-40a1-944e-77d5df5623eb" - }, - "takerPaymentAccountPayload": { - "accountNr": "dummy_31", - "paymentMethodId": "PERFECT_MONEY", - "id": "1f78ffab-082d-4646-aa3a-2089698748d0" - }, - "makerPayoutAddressString": "mtEiwZUKnyEGunzTbpqNFwrNv4wEAbVoHK", - "takerPayoutAddressString": "mk8gDkjz4gKA3qWvRbbcc82VhEBx1c43P3" -} diff --git a/network/src/main/java/io/bisq/network/p2p/network/b.txt b/network/src/main/java/io/bisq/network/p2p/network/b.txt deleted file mode 100644 index 25766f4945..0000000000 --- a/network/src/main/java/io/bisq/network/p2p/network/b.txt +++ /dev/null @@ -1,84 +0,0 @@ -{ - "offerPayload": { - "id": "bynzq-3dbea64f-8028-4235-bfc7-7b7329bff180-053", - "date": 1510249787501, - "ownerNodeAddress": { - "hostName": "localhost", - "port": 3682 - }, - "direction": "BUY", - "price": 0, - "marketPriceMargin": 0.01, - "useMarketBasedPrice": true, - "amount": 1000000, - "minAmount": 1000000, - "baseCurrencyCode": "BTC", - "counterCurrencyCode": "USD", - "arbitratorNodeAddresses": [ - { - "hostName": "localhost", - "port": 9222 - } - ], - "mediatorNodeAddresses": [ - { - "hostName": "localhost", - "port": 9222 - } - ], - "paymentMethodId": "PERFECT_MONEY", - "makerPaymentAccountId": "619c802d-48ff-40a1-944e-77d5df5623eb", - "offerFeePaymentTxId": "1e5f0c750a8bc91c92cdd2132c916089bafd649b1d288980a65ce8dfdfc9a2ca", - "versionNr": "0.5.3", - "blockHeightAtOfferCreation": 166, - "txFee": 168000, - "makerFee": 20000, - "isCurrencyForMakerFeeBtc": true, - "buyerSecurityDeposit": 3000000, - "sellerSecurityDeposit": 1000000, - "maxTradeLimit": 100000000, - "maxTradePeriod": 86400000, - "useAutoClose": false, - "useReOpenAfterAutoClose": false, - "lowerClosePrice": 0, - "upperClosePrice": 0, - "isPrivateOffer": false, - "protocolVersion": 1 - }, - "tradeAmount": 1000000, - "tradePrice": 71132787, - "takerFeeTxID": "7361ac51789257022dc07189d56a42ad918922fad81d3d074ebf85ebbfdcb3c9", - "buyerNodeAddress": { - "hostName": "localhost", - "port": 3682 - }, - "sellerNodeAddress": { - "hostName": "localhost", - "port": 3632 - }, - "arbitratorNodeAddress": { - "hostName": "localhost", - "port": 9222 - }, - "mediatorNodeAddress": { - "hostName": "localhost", - "port": 9222 - }, - "isBuyerMakerAndSellerTaker": true, - "makerAccountId": "919666446", - "takerAccountId": "1680033503", - "makerPaymentAccountPayload": { - "accountNr": "adsf", - "paymentMethodId": "PERFECT_MONEY", - "id": "619c802d-48ff-40a1-944e-77d5df5623eb", - "maxTradePeriod": 86400000 - }, - "takerPaymentAccountPayload": { - "accountNr": "dummy_31", - "paymentMethodId": "PERFECT_MONEY", - "id": "1f78ffab-082d-4646-aa3a-2089698748d0", - "maxTradePeriod": 0 - }, - "makerPayoutAddressString": "mtEiwZUKnyEGunzTbpqNFwrNv4wEAbVoHK", - "takerPayoutAddressString": "mk8gDkjz4gKA3qWvRbbcc82VhEBx1c43P3" -}