Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/jota/IotaAPIProxy.java
This commit is contained in:
AZ
2016-12-09 18:29:45 +01:00
4 changed files with 6 additions and 2 deletions
@@ -1,4 +1,4 @@
package jota.utils;
package jota.pow;
/**
* (c) 2016 Come-from-Beyond
+2
View File
@@ -2,6 +2,8 @@ package jota.utils;
import org.apache.commons.lang3.StringUtils;
import jota.pow.Curl;
/**
* Created by pinpong on 02.12.16.
*/
+1 -1
View File
@@ -17,7 +17,7 @@ public class InputValidator {
return true;
}
public static boolean isTrytes(String trytes, int length) {
public static boolean isTrytes(final String trytes, final int length) {
return trytes.matches("^[A-Z9]{" + (length == 0 ? "0," : length) + "}$");
}
}
+2
View File
@@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import jota.pow.Curl;
public class Signing {
static int[] key(int[] seed, int index, int length) {