vhad/iota.lib.java
1
0
Fork 0
mirror of https://github.com/gosticks/iota.lib.java.git synced 2025-10-16 11:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ambiguous utility method call

Browse Source 
The trits() method that takes a `String` first checks if the String contains a number, and if yes tries to convert that number into trytes. A String consisting only of digits "9" is ambiguous and has been converted as a number instead of a String (making one unit test fail). Since there is only one caller of that method that intentionally passes a number containing a String (and it is even in the same class), refactor it to have overloads taking a String vs. a long value and fix the only caller to use the long overload instead.
This commit is contained in:
Michael Schierl 2017-09-02 21:23:30 +02:00 committed by GitHub
parent f43d606f04
commit 8f655c0487
1 changed files with 41 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/main/java/jota/utils/Converter.java
View File

@ -107,16 +107,7 @@ public class Converter {
*/
public static int[] trits(final String trytes, int length) {
int[] trits = trits(trytes);
List<Integer> tritsList = new LinkedList<>();
for (int i : trits)
tritsList.add(i);
while (tritsList.size() < length)
tritsList.add(0);
return convertToIntArray(tritsList);
return Arrays.copyOf(trits, length);
}
/**
@ -127,17 +118,8 @@ public class Converter {
* @return A trits array.
*/
public static int[] trits(final long trytes, int length) {
int[] trits = trits(String.valueOf(trytes));
List<Integer> tritsList = new LinkedList<>();
for (int i : trits)
tritsList.add(i);
while (tritsList.size() < length)
tritsList.add(0);
return convertToIntArray(tritsList);
int[] trits = trits(trytes);
return Arrays.copyOf(trits, length);
}
/**
@ -146,12 +128,41 @@ public class Converter {
* @param trytes The trytes.
* @return A trits array.
*/
@Deprecated
public static int[] tritsString(final String trytes) {
int[] d = new int[3 * trytes.length()];
for (int i = 0; i < trytes.length(); i++) {
System.arraycopy(TRYTE_TO_TRITS_MAPPINGS[Constants.TRYTE_ALPHABET.indexOf(trytes.charAt(i))], 0, d, i * NUMBER_OF_TRITS_IN_A_TRYTE, NUMBER_OF_TRITS_IN_A_TRYTE);
return trits(trytes);
}
/**
* Converts trytes into trits.
*
* @param trytes The trytes to be converted.
* @return Array of trits.
**/
public static int[] trits(final long trytes) {
final List<Integer> trits = new LinkedList<>();
long absoluteValue = trytes < 0 ? -trytes : trytes;
int position = 0;
while (absoluteValue > 0) {
int remainder = (int) (absoluteValue % RADIX);
absoluteValue /= RADIX;
if (remainder > MAX_TRIT_VALUE) {
remainder = MIN_TRIT_VALUE;
absoluteValue++;
}
trits.add(position++, remainder);
}
return d;
if (trytes < 0) {
for (int i = 0; i < trits.size(); i++) {
trits.set(i, -trits.get(i));
}
}
return convertToIntArray(trits);
}
/**
@ -161,40 +172,11 @@ public class Converter {
* @return Array of trits.
**/
public static int[] trits(final String trytes) {
final List<Integer> trits = new LinkedList<>();
if (InputValidator.isValue(trytes)) {
long value = Long.parseLong(trytes);
long absoluteValue = value < 0 ? -value : value;
int position = 0;
while (absoluteValue > 0) {
int remainder = (int) (absoluteValue % RADIX);
absoluteValue /= RADIX;
if (remainder > MAX_TRIT_VALUE) {
remainder = MIN_TRIT_VALUE;
absoluteValue++;
}
trits.add(position++, remainder);
}
if (value < 0) {
for (int i = 0; i < trits.size(); i++) {
trits.set(i, -trits.get(i));
}
}
} else {
int[] d = new int[3 * trytes.length()];
for (int i = 0; i < trytes.length(); i++) {
System.arraycopy(TRYTE_TO_TRITS_MAPPINGS[Constants.TRYTE_ALPHABET.indexOf(trytes.charAt(i))], 0, d, i * NUMBER_OF_TRITS_IN_A_TRYTE, NUMBER_OF_TRITS_IN_A_TRYTE);
}
return d;
int[] d = new int[3 * trytes.length()];
for (int i = 0; i < trytes.length(); i++) {
System.arraycopy(TRYTE_TO_TRITS_MAPPINGS[Constants.TRYTE_ALPHABET.indexOf(trytes.charAt(i))], 0, d, i * NUMBER_OF_TRITS_IN_A_TRYTE, NUMBER_OF_TRITS_IN_A_TRYTE);
}
return convertToIntArray(trits);
return d;
}
/**
@ -299,4 +281,4 @@ public class Converter {
}
}
}
}