Fixed Raw transaction commands for suiting with linux environment.

JK · JK · commit fbc028b8de03 · 2018-04-23T01:25:52.000+02:00
diff --git a/src/main/java/multichain/command/RAWTransactionCommand.java b/src/main/java/multichain/command/RAWTransactionCommand.java
@@ -7,7 +7,9 @@
  */
 package multichain.command;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import multichain.command.builders.QueryBuilderRAWTransaction;
 import multichain.command.tools.MultichainTestParameter;
@@ -181,9 +183,9 @@ public static String createRawTransaction(List<TxIdVout> inputs, List<AddressBal
 	 * @return hexidecimal blob as String
 	 * @throws MultichainException
 	 */
-	public static String createRawSendFrom(String blockchainAddress, String asset, String streamItem) throws MultichainException {
+	public static String createRawSendFrom(String blockchainAddress, String asset, Map<String, Object> streamItem) throws MultichainException {
 		if(asset == null || asset.isEmpty()) {
-			asset = "'{}'";
+			asset = "{}";
 		}
 		return executeCreateRawSendFrom(blockchainAddress, asset, streamItem);
 	}
diff --git a/src/main/java/multichain/command/builders/QueryBuilderRAWTransaction.java b/src/main/java/multichain/command/builders/QueryBuilderRAWTransaction.java
@@ -7,7 +7,10 @@
  */
 package multichain.command.builders;
 
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import multichain.command.MultichainException;
 import multichain.command.tools.MultichainTestParameter;
@@ -193,8 +196,10 @@ protected static String executeCreateRawTransaction(List<TxIdVout> inputs, List<
 	 * @return hexidecimal blob as String
 	 * @throws MultichainException
 	 */
-	protected static String executeCreateRawSendFrom(String blockchainAddress, String asset, String streamItem) throws MultichainException {
-		return execute(CommandEnum.CREATERAWSENDFROM, blockchainAddress, asset, streamItem);
+	protected static String executeCreateRawSendFrom(String blockchainAddress, String asset, Map<String, Object> streamItem) throws MultichainException {
+		String streamItemAsJson = formatJson(streamItem);
+		String streamItemAsArray = "[" + streamItemAsJson +"]";
+		return execute(CommandEnum.CREATERAWSENDFROM, blockchainAddress, asset, streamItemAsArray);
 	}
 
 	/**
@@ -361,7 +366,7 @@ protected static String executeGetRawTransaction(String txid, int verbose) throw
 	 */
 	protected static String executeSendRawTransaction(String hexString) throws MultichainException{
 		MultichainTestParameter.isNotNullOrEmpty("hexString", hexString);
-		return execute(CommandEnum.SENDRAWTRANSACTION, formatJson(hexString));
+		return execute(CommandEnum.SENDRAWTRANSACTION, hexString);
 	}
 
 
@@ -428,7 +433,9 @@ protected static String executeSignRawTransaction(String hexString) throws Multi
 	protected static String executeSignRawTransactionWithPrivKey(String hexString, String privKey) throws MultichainException {
 		MultichainTestParameter.isNotNullOrEmpty("hexString", hexString);
 		MultichainTestParameter.isNotNullOrEmpty("privKey", privKey);
-		return execute(CommandEnum.SIGNRAWTRANSACTION, formatJson(hexString),"[]" ,formatJson(privKey));
+		Object privKeyAsObj = privKey;
+		privKey = "[" + formatJson(privKeyAsObj) + "]";
+		return execute(CommandEnum.SIGNRAWTRANSACTION, hexString,"[]" ,privKey);
 	}
 
 }
