Merge origin/master

This commit is contained in:
Henry Varona 2016-12-01 07:49:50 -04:30
commit bfae4ddd55
3 changed files with 7 additions and 3 deletions

View file

@ -1,7 +1,5 @@
package com.luminiasoft.bitshares; package com.luminiasoft.bitshares;
import com.luminiasoft.bitshares.interfaces.JsonSerializable;
/** /**
* Created by nelson on 11/9/16. * Created by nelson on 11/9/16.
*/ */

View file

@ -38,6 +38,7 @@ public class Main {
// e.printStackTrace(); // e.printStackTrace();
// } // }
// test.testCustomSerializer(); // test.testCustomSerializer();
test.testUserAccountSerialization();
// test.testTransactionSerialization(); // test.testTransactionSerialization();
// test.testLoginSerialization(); // test.testLoginSerialization();
// test.testNetworkBroadcastSerialization(); // test.testNetworkBroadcastSerialization();
@ -58,6 +59,6 @@ public class Main {
// test.testRelativeAccountHistory(); // test.testRelativeAccountHistory();
// test.testingInvoiceGeneration(); // test.testingInvoiceGeneration();
// test.testCompression(); // test.testCompression();
test.testCreateBinFile(); // test.testCreateBinFile();
} }
} }

View file

@ -333,6 +333,11 @@ public class Test {
System.out.println(jsonAmount); System.out.println(jsonAmount);
} }
public void testUserAccountSerialization(){
UserAccount account = new UserAccount("1.2.138632");
System.out.println(Util.bytesToHex(account.toBytes()));
}
public void testTransactionSerialization() { public void testTransactionSerialization() {
try { try {
Transaction transaction = new TransferTransactionBuilder() Transaction transaction = new TransferTransactionBuilder()