agorise/graphenej
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://bitbucket.org/bilthon/fullerene

Browse source
This commit is contained in:
Nelson R. Perez 2016-11-27 18:14:42 -05:00
commit 592098f1cf
3 changed files with 51 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/luminiasoft/bitshares/Test.java
View file

@ -58,18 +58,22 @@ public class Test {
} else if (response.result.getClass() == ArrayList.class) { } else if (response.result.getClass() == ArrayList.class) {
List list = (List) response.result; List list = (List) response.result;
if (list.size() > 0) { if (list.size() > 0) {
if(list.get(0) instanceof AccountProperties){ if (list.get(0) instanceof AccountProperties) {
List<AccountProperties> accountPropertiesList = list; List<AccountProperties> accountPropertiesList = list;
for(AccountProperties accountProperties : accountPropertiesList){ for (AccountProperties accountProperties : accountPropertiesList) {
System.out.println("Account id: "+accountProperties.id); System.out.println("Account id: " + accountProperties.id);
} }
}else if (list.get(0) instanceof AssetAmount) { } else if (list.get(0) instanceof AssetAmount) {
AssetAmount assetAmount = (AssetAmount) list.get(0); AssetAmount assetAmount = (AssetAmount) list.get(0);
System.out.println("Got fee"); System.out.println("Got fee");
System.out.println("amount: " + assetAmount.getAmount() + ", asset id: " + assetAmount.getAsset().getObjectId()); System.out.println("amount: " + assetAmount.getAmount() + ", asset id: " + assetAmount.getAsset().getObjectId());
} else if (list.get(0).getClass() == ArrayList.class) { } else if (list.get(0).getClass() == ArrayList.class) {
List sl = (List) list.get(0); List sl = (List) list.get(0);
if (sl.size() > 0) { if (sl.size() > 0) {
if (response.result.getClass() == AccountProperties.class) {
AccountProperties accountProperties = (AccountProperties) response.result;
System.out.println("Got account properties " + accountProperties);
} else {
String accountId = (String) sl.get(0); String accountId = (String) sl.get(0);
System.out.println("account id : " + accountId); System.out.println("account id : " + accountId);
try { try {
@ -94,6 +98,7 @@ public class Test {
} }
} }
} }
}
} else { } else {
System.out.println("Got empty list!"); System.out.println("Got empty list!");
} }
@ -656,7 +661,7 @@ public class Test {
} }
} }
public void testAccountNameById(){ public void testAccountNameById() {
try { try {
// Create a custom SSL context. // Create a custom SSL context.
SSLContext context = null; SSLContext context = null;

12
src/main/java/com/luminiasoft/bitshares/ws/GetAccountNameById.java
View file

@ -39,7 +39,17 @@ public class GetAccountNameById extends WebSocketAdapter {
public void onConnected(WebSocket websocket, Map<String, List<String>> headers) throws Exception { public void onConnected(WebSocket websocket, Map<String, List<String>> headers) throws Exception {
ArrayList<Serializable> accountParams = new ArrayList(); ArrayList<Serializable> accountParams = new ArrayList();
ArrayList<Serializable> paramAddress = new ArrayList(); ArrayList<Serializable> paramAddress = new ArrayList();
paramAddress.add(accountID); paramAddress.add(new JsonSerializable() {
@Override
public String toJsonString() {
return accountID;
}
@Override
public JsonElement toJsonObject() {
return new JsonParser().parse(accountID);
}
});
accountParams.add(paramAddress); accountParams.add(paramAddress);
ApiCall getAccountByAddress = new ApiCall(0, RPC.CALL_GET_ACCOUNTS, accountParams, RPC.VERSION, 1); ApiCall getAccountByAddress = new ApiCall(0, RPC.CALL_GET_ACCOUNTS, accountParams, RPC.VERSION, 1);
websocket.sendText(getAccountByAddress.toJsonString()); websocket.sendText(getAccountByAddress.toJsonString());

13
src/main/java/com/luminiasoft/bitshares/ws/GetAccountsByAddress.java
View file

@ -40,7 +40,17 @@ public class GetAccountsByAddress extends WebSocketAdapter {
public void onConnected(WebSocket websocket, Map<String, List<String>> headers) throws Exception { public void onConnected(WebSocket websocket, Map<String, List<String>> headers) throws Exception {
ArrayList<Serializable> accountParams = new ArrayList(); ArrayList<Serializable> accountParams = new ArrayList();
ArrayList<Serializable> paramAddress = new ArrayList(); ArrayList<Serializable> paramAddress = new ArrayList();
paramAddress.add(address.toString()); paramAddress.add(new JsonSerializable() {
@Override
public String toJsonString() {
return address.toString();
}
@Override
public JsonElement toJsonObject() {
return new JsonParser().parse(address.toString());
}
});
accountParams.add(paramAddress); accountParams.add(paramAddress);
ApiCall getAccountByAddress = new ApiCall(0, RPC.CALL_GET_KEY_REFERENCES, accountParams, RPC.VERSION, 1); ApiCall getAccountByAddress = new ApiCall(0, RPC.CALL_GET_KEY_REFERENCES, accountParams, RPC.VERSION, 1);
websocket.sendText(getAccountByAddress.toJsonString()); websocket.sendText(getAccountByAddress.toJsonString());
@ -51,6 +61,7 @@ public class GetAccountsByAddress extends WebSocketAdapter {
System.out.println("<<< "+frame.getPayloadText()); System.out.println("<<< "+frame.getPayloadText());
String response = frame.getPayloadText(); String response = frame.getPayloadText();
Gson gson = new Gson(); Gson gson = new Gson();
Type GetAccountByAddressResponse = new TypeToken<WitnessResponse<List<List<String>>>>(){}.getType(); Type GetAccountByAddressResponse = new TypeToken<WitnessResponse<List<List<String>>>>(){}.getType();
WitnessResponse<WitnessResponse<List<List<String>>>> witnessResponse = gson.fromJson(response, GetAccountByAddressResponse); WitnessResponse<WitnessResponse<List<List<String>>>> witnessResponse = gson.fromJson(response, GetAccountByAddressResponse);
if (witnessResponse.error != null) { if (witnessResponse.error != null) {