From e0dc12681f6c6d9be7414e34738e41a72c993b5d Mon Sep 17 00:00:00 2001 From: pinpong Date: Mon, 6 Nov 2017 21:21:43 +0100 Subject: [PATCH] expanded getAccountData --- jota/src/main/java/jota/IotaAPI.java | 4 ++-- .../dto/response/GetAccountDataResponse.java | 14 +++++++++++++- .../response/GetBalancesAndFormatResponse.java | 16 ++++++++-------- .../jota/dto/response/GetTransferResponse.java | 1 + jota/src/test/java/jota/IotaAPITest.java | 7 +++---- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/jota/src/main/java/jota/IotaAPI.java b/jota/src/main/java/jota/IotaAPI.java index 8dc7f9f..35e456a 100644 --- a/jota/src/main/java/jota/IotaAPI.java +++ b/jota/src/main/java/jota/IotaAPI.java @@ -479,7 +479,7 @@ public class IotaAPI extends IotaAPICore { @SuppressWarnings("unchecked") GetBalancesAndFormatResponse newinputs = getInputs(seed, security, 0, 0, totalValue); // If inputs with enough balance - return addRemainder(seed, security, newinputs.getInput(), bundle, tag, totalValue, remainder, signatureFragments); + return addRemainder(seed, security, newinputs.getInputs(), bundle, tag, totalValue, remainder, signatureFragments); } } else { @@ -724,7 +724,7 @@ public class IotaAPI extends IotaAPICore { GetTransferResponse gtr = getTransfers(seed, security, start, end, inclusionStates); GetBalancesAndFormatResponse gbr = getInputs(seed, security, start, end, threshold); - return GetAccountDataResponse.create(gna.getAddresses(), gtr.getTransfers(), gbr.getTotalBalance(), stopWatch.getElapsedTimeMili()); + return GetAccountDataResponse.create(gna.getAddresses(), gtr.getTransfers(), gbr.getInputs(), gbr.getTotalBalance(), stopWatch.getElapsedTimeMili()); } /** diff --git a/jota/src/main/java/jota/dto/response/GetAccountDataResponse.java b/jota/src/main/java/jota/dto/response/GetAccountDataResponse.java index 27ee80a..a4fffda 100644 --- a/jota/src/main/java/jota/dto/response/GetAccountDataResponse.java +++ b/jota/src/main/java/jota/dto/response/GetAccountDataResponse.java @@ -1,6 +1,7 @@ package jota.dto.response; import jota.model.Bundle; +import jota.model.Input; import java.util.List; @@ -11,16 +12,18 @@ public class GetAccountDataResponse extends AbstractResponse { private List addresses; private Bundle[] transferBundle; + private List inputs; private long balance; /** * Initializes a new instance of the GetAccountDataResponse class. */ - public static GetAccountDataResponse create(List addresses, Bundle[] transferBundle, long balance, long duration) { + public static GetAccountDataResponse create(List addresses, Bundle[] transferBundle, List inputs, long balance, long duration) { GetAccountDataResponse res = new GetAccountDataResponse(); res.addresses = addresses; res.transferBundle = transferBundle; + res.inputs = inputs; res.balance = balance; res.setDuration(duration); return res; @@ -44,6 +47,15 @@ public class GetAccountDataResponse extends AbstractResponse { return transferBundle; } + /** + * Gets the inputs. + * + * @return The inputs. + */ + public List getInput() { + return inputs; + } + /** * Gets the balance. * diff --git a/jota/src/main/java/jota/dto/response/GetBalancesAndFormatResponse.java b/jota/src/main/java/jota/dto/response/GetBalancesAndFormatResponse.java index 2d41d6d..819cf9f 100644 --- a/jota/src/main/java/jota/dto/response/GetBalancesAndFormatResponse.java +++ b/jota/src/main/java/jota/dto/response/GetBalancesAndFormatResponse.java @@ -9,16 +9,16 @@ import java.util.List; **/ public class GetBalancesAndFormatResponse extends AbstractResponse { - private List input; + private List inputs; private long totalBalance; /** * Initializes a new instance of the GetBalancesAndFormatResponse class. */ - public static GetBalancesAndFormatResponse create(List inputs, long totalBalance2, long duration) { + public static GetBalancesAndFormatResponse create(List inputs, long totalBalance, long duration) { GetBalancesAndFormatResponse res = new GetBalancesAndFormatResponse(); - res.setInput(inputs); - res.setTotalBalance(totalBalance2); + res.inputs = inputs; + res.totalBalance = totalBalance; res.setDuration(duration); return res; } @@ -28,8 +28,8 @@ public class GetBalancesAndFormatResponse extends AbstractResponse { * * @return The transactions. */ - public List getInput() { - return input; + public List getInputs() { + return inputs; } /** @@ -37,8 +37,8 @@ public class GetBalancesAndFormatResponse extends AbstractResponse { * * @param input The input. */ - public void setInput(List input) { - this.input = input; + public void setInputs(List input) { + this.inputs = inputs; } /** diff --git a/jota/src/main/java/jota/dto/response/GetTransferResponse.java b/jota/src/main/java/jota/dto/response/GetTransferResponse.java index bc3060c..f065ee5 100644 --- a/jota/src/main/java/jota/dto/response/GetTransferResponse.java +++ b/jota/src/main/java/jota/dto/response/GetTransferResponse.java @@ -15,6 +15,7 @@ public class GetTransferResponse extends AbstractResponse { public static GetTransferResponse create(Bundle[] transferBundle, long duration) { GetTransferResponse res = new GetTransferResponse(); res.transferBundle = transferBundle; + res.setDuration(duration); return res; } diff --git a/jota/src/test/java/jota/IotaAPITest.java b/jota/src/test/java/jota/IotaAPITest.java index 927a7ff..48f652f 100644 --- a/jota/src/test/java/jota/IotaAPITest.java +++ b/jota/src/test/java/jota/IotaAPITest.java @@ -117,8 +117,7 @@ public class IotaAPITest { System.out.println(res); assertThat(res, IsNull.notNullValue()); assertThat(res.getTotalBalance(), IsNull.notNullValue()); - assertThat(res.getInput(), IsNull.notNullValue()); - + assertThat(res.getInputs(), IsNull.notNullValue()); } @Test @@ -146,7 +145,7 @@ public class IotaAPITest { GetBalancesAndFormatResponse rsp = iotaClient.getInputs(TEST_SEED1, 2, 0, 0, 100); - for (Input input : rsp.getInput()) { + for (Input input : rsp.getInputs()) { inputlist.add(input); } transfers.add(new jota.model.Transfer(TEST_ADDRESS_WITHOUT_CHECKSUM_SECURITY_LEVEL_2, 0, TEST_MESSAGE, TEST_TAG)); @@ -256,7 +255,7 @@ public class IotaAPITest { GetBalancesAndFormatResponse rsp = iotaClient.getInputs(TEST_SEED1, 2, 0, 0, 100); - for (Input input : rsp.getInput()) { + for (Input input : rsp.getInputs()) { inputlist.add(input); }