diff --git a/src/main/java/jota/IotaAPIProxy.java b/src/main/java/jota/IotaAPIProxy.java index a017660..b8a0087 100644 --- a/src/main/java/jota/IotaAPIProxy.java +++ b/src/main/java/jota/IotaAPIProxy.java @@ -245,26 +245,6 @@ public class IotaAPIProxy { } return GetNewAddressResponse.create(allAddresses); } - - /* - * newAddress - * broadcastAndStore - * sendTrytes - * prepareTransfers - * getInputs - * getLatestInclusion - - getTransfers - sendTransfer - getBundle - - getTransactionsObjects - findTransactionObjects - - replayBundle - broadcastBundle - getAccountData - */ /** * @param {string} seed @@ -310,7 +290,6 @@ public class IotaAPIProxy { } } } - if (nonTailBundleHashes.isEmpty()) return null; List bundleObjects = findTransactionObjectsByBundle(nonTailBundleHashes.toArray(new String[nonTailBundleHashes.size()])); for (Transaction trx : bundleObjects) { diff --git a/src/main/java/jota/utils/Converter.java b/src/main/java/jota/utils/Converter.java index 3329175..ce2d604 100644 --- a/src/main/java/jota/utils/Converter.java +++ b/src/main/java/jota/utils/Converter.java @@ -278,9 +278,9 @@ public class Converter { trx.setAddress(trytes.substring(2187, 2268)); trx.setValue("" + Converter.longValue(Arrays.copyOfRange(transactionTrits, 6804, 6837))); trx.setTag(trytes.substring(2295, 2322)); - trx.setTimestamp("" + Converter.value(Arrays.copyOfRange(transactionTrits, 6966, 6993))); - trx.setCurrentIndex("" + Converter.value(Arrays.copyOfRange(transactionTrits, 6993, 7020))); - trx.setLastIndex("" + Converter.value(Arrays.copyOfRange(transactionTrits, 7020, 7047))); + trx.setTimestamp("" + Converter.longValue(Arrays.copyOfRange(transactionTrits, 6966, 6993))); + trx.setCurrentIndex("" + Converter.longValue(Arrays.copyOfRange(transactionTrits, 6993, 7020))); + trx.setLastIndex("" + Converter.longValue(Arrays.copyOfRange(transactionTrits, 7020, 7047))); trx.setBundle(trytes.substring(2349, 2430)); trx.setTrunkTransaction(trytes.substring(2430, 2511)); trx.setBranchTransaction(trytes.substring(2511, 2592)); diff --git a/src/test/java/jota/IotaAPIProxyTest.java b/src/test/java/jota/IotaAPIProxyTest.java index 9dab078..42f487c 100644 --- a/src/test/java/jota/IotaAPIProxyTest.java +++ b/src/test/java/jota/IotaAPIProxyTest.java @@ -29,7 +29,7 @@ public class IotaAPIProxyTest { private static Gson gson = new GsonBuilder().create(); private static final String TEST_SEED1 = "AAA999999999999999999999999999999999999999999999999999999999999999999999999999999"; - private static final String TEST_SEED2 = "AAA999999999999999999999999999999999999999999999999999999999999999999999999999999"; + private static final String TEST_SEED2 = "IHDEENZYITYVYSPKAURUZAQKGVJEREFDJMYTANNXXGPZ9GJWTEOJJ9IPMXOGZNQLSNMFDSQOTZAEETUEA"; private static final String TEST_ADDRESS_WITHOUT_CHECKSUM = "PNGMCSNRCTRHCHPXYTPKEJYPCOWKOMRXZFHH9N9VDIKMNVAZCMIYRHVJIAZARZTUETJVFDMBEBIQE9QTH"; private static final String TEST_ADDRESS_WITH_CHECKSUM = "PNGMCSNRCTRHCHPXYTPKEJYPCOWKOMRXZFHH9N9VDIKMNVAZCMIYRHVJIAZARZTUETJVFDMBEBIQE9QTHBFWDAOEFA"; private static final String TEST_HASH = "OAATQS9VQLSXCLDJVJJVYUGONXAXOFMJOZNSYWRZSWECMXAQQURHQBJNLD9IOFEPGZEPEMPXCIVRX9999"; @@ -205,11 +205,9 @@ public class IotaAPIProxyTest { } @Test - public void shouldGetTransfers() throws InvalidBundleException, ArgumentException, InvalidSignatureException { - GetTransferResponse gtr = proxy.getTransfers(TEST_SEED1, 0, 0, false); - assertThat(gtr.getTransfers(), IsNull.notNullValue()); - - GetTransferResponse gtr2 = proxy.getTransfers(TEST_SEED1, 0, 0, true); - assertThat(gtr2.getTransfers(), IsNull.notNullValue()); + public void shouldGetTrasfers() throws InvalidBundleException, ArgumentException, InvalidSignatureException { + GetTransferResponse gtr = proxy.getTransfers(TEST_SEED2, 0, 0, true); + assertThat(gtr, IsNull.notNullValue()); + assertThat(proxy.getTransfers(TEST_SEED2, 0, 0, false), IsNull.notNullValue()); } } \ No newline at end of file