Skip to content

Commit 2b9a555

Browse files
committed
Merge branch 'fix/experimental_parameter'
Conflicts: src/test/java/multichain/command/RAWTransactionCommandTest.java
2 parents 3476021 + b1c3a50 commit 2b9a555

File tree

4 files changed

+487
-485
lines changed

4 files changed

+487
-485
lines changed

src/main/java/multichain/command/RAWTransactionCommand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public SignedTransactionRAW createRawSendFrom(String address, List<RawParam> raw
264264
* or
265265
* "hex" (string) The transaction hash in hex (if action= "send")
266266
*/
267-
public String createRawSendFrom(String address, List<RawParam> rawParams, String[] data) throws MultichainException {
267+
public String createRawSendFrom(String address, List<RawParam> rawParams, Object[] data) throws MultichainException {
268268
String transactionRAW = new String();
269269

270270
Object objectTransactionRAW = executeCreateRawSendFrom(address, rawParams, data, null);
@@ -702,8 +702,9 @@ public Object sendRawTransaction(String hexString) throws MultichainException {
702702
*
703703
* @return
704704
* @throws MultichainException
705+
* @param hexString
705706
*/
706-
public SignedTransactionRAW signRawTransaction(String hexString) throws MultichainException {
707+
public SignedTransactionRAW signRawTransaction(Object[] hexString) throws MultichainException {
707708
SignedTransactionRAW signedTransactionRAW = new SignedTransactionRAW();
708709

709710
Object objectTransactionRAW = executeSignRawTransaction(hexString);

src/main/java/multichain/command/builders/QueryBuilderCommon.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.io.IOException;
1111
import java.io.UnsupportedEncodingException;
12+
import java.nio.charset.StandardCharsets;
1213
import java.util.ArrayList;
1314
import java.util.Arrays;
1415
import java.util.HashMap;
@@ -174,6 +175,7 @@ protected Object execute(CommandEnum command, Object... parameters) throws Multi
174175
// Generate the entity and initialize request
175176
StringEntity rpcEntity = prepareRpcEntity(entityValues);
176177
httppost.setEntity(rpcEntity);
178+
177179
// Execute the request and get the answer
178180
return executeRequest();
179181

@@ -219,7 +221,7 @@ private Object executeRequest() throws IOException, ClientProtocolException, Mul
219221

220222
private Map<String, Object> prepareMap(CommandEnum command, Object... parameters) {
221223
Map<String, Object> entityValues = new HashMap<String, Object>();
222-
entityValues.put("id", UUID.randomUUID().toString());
224+
entityValues.put("id", UUID.randomUUID().toString( ));
223225
entityValues.put("method", command.toString().toLowerCase());
224226
List<Object> paramList = new ArrayList<Object>(Arrays.asList(parameters));
225227
entityValues.put("params", paramList);

0 commit comments

Comments
 (0)