Skip to content

Commit

Permalink
Reverting non-relevant changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mrosseel committed Oct 12, 2017
1 parent 0755cac commit c79d9e9
Show file tree
Hide file tree
Showing 39 changed files with 48 additions and 46 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@ language: java
jdk: oraclejdk8

script: mvn clean install -DskipTests

notifications:
slack:
rooms:
- secure: H82Q57T5nRNDfVnxzlWZ2WoeGt71oq2eJGHbqJ4wP2tIc8b02UO9bztPKFxbm9slMu0JjxZdJfnHSgNZKfPVXrTqwPYRVjKqm7m9TynIlkQabV+yCI/oRvy4Xi/Xj7/aPvZat4s/bxjrtw9KwVdpmqWvRNNSgiTqQ4teBJ1uQGs=
on_success: change
on_failure: always
2 changes: 1 addition & 1 deletion common/src/main/java/io/bisq/common/UserThread.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static void execute(Runnable command) {
}


// Prefer FxTimer if a delay is needed in a JavaFx class (gui module)
// Prefer FxTimer if a delay is needed in a JavaFx class (gui module)
public static Timer runAfterRandomDelay(Runnable runnable, long minDelayInSec, long maxDelayInSec) {
return UserThread.runAfterRandomDelay(runnable, minDelayInSec, maxDelayInSec, TimeUnit.SECONDS);
}
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/io/bisq/common/app/DevEnv.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ 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";


// 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;
}
2 changes: 1 addition & 1 deletion common/src/main/java/io/bisq/common/locale/BankUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static boolean isBankNameRequired(String countryCode) {
case "CA":
case "SE":
case "HK":
// We show always the bank name as it is needed in specific banks.
// We show always the bank name as it is needed in specific banks.
// Though that handling should be optimized in futures.
return true;
// return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class CurrencyTuple {

public CurrencyTuple(String code, String name) {
// We use Fiat class and there precision is 4
// In future we might add custom precision per currency
// In future we might add custom precision per currency
this(code, name, 4);
}

Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/io/bisq/common/locale/LocaleUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public class LocaleUtil {

public static List<Locale> getAllLocales() {

// derived form Locale.getAvailableLocales() and added some missing locales
// Key is ISO 639-1 code (https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes), value is ISO 3166 country code
// derived form Locale.getAvailableLocales() and added some missing locales
// Key is ISO 639-1 code (https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes), value is ISO 3166 country code
List<Locale> allLocales = new ArrayList<>();

allLocales.add(new Locale("bg", "", ""));
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/io/bisq/common/util/JsonExclude.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
public @interface JsonExclude {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ public Address getAddress() {
@SuppressWarnings("UnusedParameters")
public void onTransactionConfidenceChanged(TransactionConfidence confidence) {
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ public Address getAddress() {
@SuppressWarnings("UnusedParameters")
public void onBalanceChanged(Coin balance, Transaction tx) {
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ public String getTxID() {
@SuppressWarnings("UnusedParameters")
public void onTransactionConfidenceChanged(TransactionConfidence confidence) {
}
}
}
4 changes: 0 additions & 4 deletions core/src/main/java/io/bisq/core/offer/Offer.java
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,6 @@ public String getCountryCode() {
return offerPayload.getCountryCode();
}

/**
* notation is switched when
* @return
*/
public String getCurrencyCode() {
return CurrencyUtil.isCryptoCurrency(offerPayload.getBaseCurrencyCode()) ?
offerPayload.getBaseCurrencyCode() :
Expand Down
1 change: 1 addition & 0 deletions gui/src/main/java/io/bisq/gui/app/BisqAppMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public static void main(String[] args) throws Exception {
.withRequiredArg();
parser.accepts(AppOptionKeys.APP_NAME_KEY, description("Application name", DEFAULT_APP_NAME))
.withRequiredArg();

OptionSet options;
try {
options = parser.parse(args);
Expand Down
2 changes: 0 additions & 2 deletions gui/src/main/java/io/bisq/gui/app/BisqAppModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ protected void configure() {
bind(NetworkProtoResolver.class).to(CoreNetworkProtoResolver.class).in(Singleton.class);
bind(PersistenceProtoResolver.class).to(CorePersistenceProtoResolver.class).in(Singleton.class);



// ordering is used for shut down sequence
install(tradeModule());
install(encryptionServiceModule());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,4 @@ private static void createErrorPopOver(String errorMessage) {
errorMessageDisplay.setArrowIndent(5);
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,4 @@ private static void createErrorPopOver(String errorMessage) {
errorMessageDisplay.setArrowIndent(5);
}

}
}
2 changes: 1 addition & 1 deletion gui/src/main/java/io/bisq/gui/main/MainView.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
<?import javafx.scene.layout.StackPane?>
<StackPane fx:id="root" fx:controller="io.bisq.gui.main.MainView"
xmlns:fx="http://javafx.com/fxml">
</StackPane>
</StackPane>
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
xmlns:fx="http://javafx.com/fxml">
<Tab fx:id="accountSettingsTab" closable="false"/>

</TabPane>
</TabPane>
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
<padding>
<Insets bottom="0.0" left="10.0" right="10.0" top="0.0"/>
</padding>
</VBox>
</VBox>
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
<ColumnConstraints hgrow="ALWAYS" minWidth="300.0"/>
</columnConstraints>

</GridPane>
</GridPane>
2 changes: 1 addition & 1 deletion gui/src/main/java/io/bisq/gui/main/funds/FundsView.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
<Tab fx:id="lockedTab" closable="false"/>
<Tab fx:id="transactionsTab" closable="false"/>

</TabPane>
</TabPane>
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
<Insets bottom="10.0" left="20.0" top="10.0" right="20"/>
</padding>

</VBox>
</VBox>
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
<Insets bottom="10.0" left="25.0" top="20.0" right="25"/>
</padding>

</GridPane>
</GridPane>
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
<Insets bottom="10.0" left="20.0" top="10.0" right="20"/>
</padding>

</VBox>
</VBox>
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ public void update(double height, double candleWidth, CandleData candleData) {
private void updateStyleClasses() {
bar.getStyleClass().setAll("volume-bar", seriesStyleClass, dataStyleClass, "bg");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ protected void layoutPlotChildren() {
candleWidth = xa.getDisplayPosition(xa.getTickUnit()) * 0.90; // use 90% width between ticks
}

// 97 is visible chart data height if chart height is 140.
// 97 is visible chart data height if chart height is 140.
// So we subtract 43 form the height to get the height for the bar to the bottom.
// Did not find a way how to request the chart data height
final double height = getHeight() - 43;
Expand Down Expand Up @@ -184,4 +184,4 @@ protected void updateAxisRange() {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void onRemoved(Offer offer) {
// Update state in case that that offer is used in the take offer screen, so it gets updated correctly
offer.setState(Offer.State.REMOVED);

// clean up possible references in openOfferManager
// clean up possible references in openOfferManager
tradeManager.onOfferRemovedFromRemoteOfferBook(offer);
Optional<OfferBookListItem> candidate = offerBookListItems.stream()
.filter(item -> item.getOffer().getId().equals(offer.getId()))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
<ColumnConstraints halignment="RIGHT" hgrow="SOMETIMES" minWidth="200"/>
<ColumnConstraints hgrow="ALWAYS"/>
</columnConstraints>
</GridPane>
</GridPane>
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
<ColumnConstraints hgrow="SOMETIMES" halignment="RIGHT" minWidth="140.0"/>
<ColumnConstraints hgrow="ALWAYS" minWidth="300.0"/>
</columnConstraints>
</GridPane>
</GridPane>
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ public ValidationResult validate(String input) {
// https://no.wikipedia.org/wiki/MOD11#Implementasjoner_i_forskjellige_programmeringspr.C3.A5k
// https://en.wikipedia.org/wiki/International_Bank_Account_Number#Generating_IBAN_check_digits6

// 11 digits, last digit is checksum. Checksum algoritm is
// 11 digits, last digit is checksum. Checksum algoritm is
// MOD11 with weights 2,3,4,5,6,7,2,3,4,5 right to left.
// First remove whitespace and periods. Normal formatting is:
// First remove whitespace and periods. Normal formatting is:
// 1234.56.78903
input2 = StringUtils.remove(input, " ");
input2 = StringUtils.remove(input2, ".");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*
* BIC information taken from German wikipedia (2017-01-30)
*
*
* length 8 or 11 characters
* General format: BBBB CC LL (bbb)
* with B - Bank code
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ static class TestView2 extends AbstractView {

static class TestView3 extends AbstractView {
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ public void validate() throws Exception {
assertFalse(validator.validate("+1 236 1234-567").isValid); // Wrong grouping
}

}
}
2 changes: 1 addition & 1 deletion network/src/main/java/io/bisq/network/DnsLookupTor.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@ public static InetAddress lookup(Socks5Proxy proxy, String host) throws DnsLooku
private static byte b(char c) {
return (byte) c;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ public String toString() {
return hostname;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ public void shutdown() {
//TODO should we add a DnsLookupTor.shutdown() ?
}

}
}
2 changes: 1 addition & 1 deletion network/src/main/java/io/bisq/network/p2p/P2PModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ protected void configure() {
bindConstant().annotatedWith(named(NetworkOptionKeys.SOCKS_5_PROXY_BTC_ADDRESS)).to(environment.getRequiredProperty(NetworkOptionKeys.SOCKS_5_PROXY_BTC_ADDRESS));
bindConstant().annotatedWith(named(NetworkOptionKeys.SOCKS_5_PROXY_HTTP_ADDRESS)).to(environment.getRequiredProperty(NetworkOptionKeys.SOCKS_5_PROXY_HTTP_ADDRESS));
}
}
}
4 changes: 2 additions & 2 deletions package/linux/64bitBuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ $JAVA_HOME/bin/javapackager \
-appclass io.bisq.gui.app.BisqAppMain \
-BjvmOptions=-Xss1280k \
-outfile Bisq

# when we have support for security manager we use that
# when we have support for security manager we use that
# \
# -BjvmOptions=-Djava.security.manager \
# -BjvmOptions=-Djava.security.debug=failure \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private Map<String, PriceData> getMap(String json) {
long ts = Instant.now().getEpochSecond();
treeMap.entrySet().stream().forEach(e -> {
Object value = e.getValue();
// We need to check the type as we get an unexpected "timestamp" object at the end:
// We need to check the type as we get an unexpected "timestamp" object at the end:
if (value instanceof LinkedTreeMap) {
//noinspection unchecked
LinkedTreeMap<String, Object> data = (LinkedTreeMap) value;
Expand Down
2 changes: 1 addition & 1 deletion statistics/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<logger name="io.bisq.p2p.peers.getdata" level="WARN"/>
<logger name="io.bisq.p2p.peers.keepalive" level="WARN"/>
<logger name="io.bisq.p2p.peers.peerexchange" level="WARN"/>
<logger name="io.bisq.p2p.network" level="WARN"/>
<logger name="io.bisq.p2p.P2PService" level="WARN"/>-->

Expand Down

0 comments on commit c79d9e9

Please sign in to comment.