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

Fixed RedeemHtlcOperation JSON and byte serialization and introduced a serialization test case

Browse source
This commit is contained in:
Nelson R. Perez 2019-08-01 13:03:10 -05:00
parent 5350cfb739
commit 2cd989eade
2 changed files with 75 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
graphenej/src/main/java/cy/agorise/graphenej/operations/RedeemHtlcOperation.java
View file

@ -85,7 +85,8 @@ public class RedeemHtlcOperation extends BaseOperation {
e.printStackTrace(); e.printStackTrace();
} }
byte[] preimageLength = byteArrayOutputStream.toByteArray(); byte[] preimageLength = byteArrayOutputStream.toByteArray();
return Bytes.concat(feeBytes, htlcBytes, redeemerBytes, preimageLength, this.preimage); byte[] extensionsBytes = extensions.toBytes();
return Bytes.concat(feeBytes, htlcBytes, redeemerBytes, preimageLength, this.preimage, extensionsBytes);
} }
@Override @Override
@ -94,7 +95,7 @@ public class RedeemHtlcOperation extends BaseOperation {
array.add(this.getId()); array.add(this.getId());
JsonObject jsonObject = new JsonObject(); JsonObject jsonObject = new JsonObject();
jsonObject.add(KEY_FEE, fee.toJsonObject()); jsonObject.add(KEY_FEE, fee.toJsonObject());
jsonObject.add(KEY_REDEEMER, this.redeemer.toJsonObject()); jsonObject.addProperty(KEY_REDEEMER, this.redeemer.getObjectId());
jsonObject.addProperty(KEY_PREIMAGE, Util.bytesToHex(this.preimage)); jsonObject.addProperty(KEY_PREIMAGE, Util.bytesToHex(this.preimage));
jsonObject.addProperty(KEY_HTLC_ID, this.htlc.getObjectId()); jsonObject.addProperty(KEY_HTLC_ID, this.htlc.getObjectId());
jsonObject.add(KEY_EXTENSIONS, new JsonArray()); jsonObject.add(KEY_EXTENSIONS, new JsonArray());

72
graphenej/src/test/java/cy/agorise/graphenej/operations/RedeemHtlcOperationTest.java Normal file
View file

@ -0,0 +1,72 @@
package cy.agorise.graphenej.operations;
import com.google.common.primitives.Bytes;
import com.google.common.primitives.UnsignedLong;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import org.junit.Assert;
import org.junit.Test;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.TimeZone;
import cy.agorise.graphenej.Asset;
import cy.agorise.graphenej.AssetAmount;
import cy.agorise.graphenej.BaseOperation;
import cy.agorise.graphenej.BlockData;
import cy.agorise.graphenej.Chains;
import cy.agorise.graphenej.Htlc;
import cy.agorise.graphenej.Transaction;
import cy.agorise.graphenej.UserAccount;
import cy.agorise.graphenej.Util;
public class RedeemHtlcOperationTest {
private final String SERIALIZED_OP = "00000000000000000084017c06666f6f62617200";
private final String SERIALIZED_TX = "f68585abf4dce7c80457013200000000000000000084017c06666f6f6261720000";
private final Asset CORE = new Asset("1.3.0");
private final String PREIMAGE_HEX = "666f6f626172";
private RedeemHtlcOperation buildRedeemdHtlcOperation(){
AssetAmount fee = new AssetAmount(UnsignedLong.valueOf("0"), CORE);
UserAccount redeemer = new UserAccount("1.2.124");
Htlc htlc = new Htlc("1.16.132");
byte[] preimage = Util.hexToBytes(PREIMAGE_HEX);
return new RedeemHtlcOperation(fee, redeemer, htlc, preimage);
}
@Test
public void testOperationSerialization(){
RedeemHtlcOperation redeemHtlcOperation = this.buildRedeemdHtlcOperation();
byte[] opBytes = redeemHtlcOperation.toBytes();
Assert.assertArrayEquals(Util.hexToBytes(SERIALIZED_OP), opBytes);
}
@Test
public void testTransactionSerialization() throws ParseException {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
Date expirationDate = dateFormat.parse("2016-04-06T08:29:27");
BlockData blockData = new BlockData(34294, 3707022213L, (expirationDate.getTime() / 1000));
ArrayList<BaseOperation> operations = new ArrayList<>();
operations.add(buildRedeemdHtlcOperation());
Transaction transaction = new Transaction(blockData, operations);
// Checking byte serialization
byte[] txBytes = transaction.toBytes();
byte[] expected = Bytes.concat(Util.hexToBytes(Chains.BITSHARES.CHAIN_ID), Util.hexToBytes(SERIALIZED_TX));
Assert.assertArrayEquals(expected, txBytes);
// Checking JSON serialization
JsonObject jsonObject = transaction.toJsonObject();
JsonArray operationsArray = jsonObject.get("operations").getAsJsonArray().get(0).getAsJsonArray();
int operationId = operationsArray.get(0).getAsInt();
JsonObject operationJson = operationsArray.get(1).getAsJsonObject();
Assert.assertEquals("2016-04-06T08:29:27", jsonObject.get("expiration").getAsString());
Assert.assertEquals(50, operationId);
Assert.assertEquals("1.16.132", operationJson.getAsJsonObject().get("htlc_id").getAsString());
Assert.assertEquals(PREIMAGE_HEX, operationJson.getAsJsonObject().get("preimage").getAsString());
Assert.assertEquals("1.2.124", operationJson.getAsJsonObject().get("redeemer").getAsString());
}
}