mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add DevFlags.DEV_ARBITRATOR to support dev keys. Autofill key if DEV_ARBITRATOR is set

Browse source
This commit is contained in:
Manfred Karrer 2017-03-03 18:37:33 -05:00
parent 63c4bc546f
commit e553a038f5
3 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/src/main/java/io/bitsquare/app/DevFlags.java
View file

@ -2,5 +2,6 @@ package io.bitsquare.app;
public class DevFlags {
public static final boolean STRESS_TEST_MODE = false;
public static final boolean DEV_ARBITRATOR = true;
public static final boolean DEV_MODE = STRESS_TEST_MODE || true;
}

10
core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java
View file

@ -18,6 +18,7 @@
package io.bitsquare.arbitration;
import com.google.inject.Inject;
import io.bitsquare.app.DevFlags;
import io.bitsquare.common.Timer;
import io.bitsquare.common.UserThread;
import io.bitsquare.common.crypto.KeyRing;
@ -41,10 +42,7 @@ import javax.annotation.Nullable;
import java.math.BigInteger;
import java.security.PublicKey;
import java.security.SignatureException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -67,7 +65,9 @@ public class ArbitratorManager {
// to the publicKeys list and use the test PrivKey for arbitrator registration.
// PrivKey for dev testing: 6ac43ea1df2a290c1c8391736aa42e4339c5cb4f110ff0257a13b63211977b7a
// Matching pubKey for dev testing: 027a381b5333a56e1cc3d90d3a7d07f26509adf7029ed06fc997c656621f8da1ee
private static final List<String> publicKeys = new ArrayList<>(Arrays.asList(
private static final List<String> publicKeys = DevFlags.DEV_ARBITRATOR ?
new ArrayList<>(Collections.singletonList("027a381b5333a56e1cc3d90d3a7d07f26509adf7029ed06fc997c656621f8da1ee")) :
new ArrayList<>(Arrays.asList(
"03697a499d24f497b3c46bf716318231e46c4e6a685a4e122d8e2a2b229fa1f4b8",
"0365c6af94681dbee69de1851f98d4684063bf5c2d64b1c73ed5d90434f375a054",
"031c502a60f9dbdb5ae5e438a79819e4e1f417211dd537ac12c9bc23246534c4bd",

3
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/EnterPrivKeyWindow.java
View file

@ -17,6 +17,7 @@
package io.bitsquare.gui.main.overlays.windows;
import io.bitsquare.app.DevFlags;
import io.bitsquare.gui.components.InputTextField;
import io.bitsquare.gui.main.overlays.Overlay;
import io.bitsquare.gui.main.overlays.popups.Popup;
@ -107,6 +108,8 @@ public class EnterPrivKeyWindow extends Overlay<EnterPrivKeyWindow> {
GridPane.setRowIndex(label, ++rowIndex);
keyInputTextField = new InputTextField();
if (DevFlags.DEV_ARBITRATOR)
keyInputTextField.setText("6ac43ea1df2a290c1c8391736aa42e4339c5cb4f110ff0257a13b63211977b7a");
GridPane.setMargin(keyInputTextField, new Insets(3, 0, 0, 0));
GridPane.setRowIndex(keyInputTextField, rowIndex);
GridPane.setColumnIndex(keyInputTextField, 1);