Skip to content

Commit dc11577

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 2b9a555 + 249477c commit dc11577

File tree

6 files changed

+780
-3
lines changed

6 files changed

+780
-3
lines changed

src/main/java/multichain/command/MultiChainCommand.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class MultiChainCommand {
2222
private RAWTransactionCommand rawTransactionCommand;
2323
private StreamCommand streamCommand;
2424
private WalletTransactionCommand walletTransactionCommand;
25+
private WalletCommand walletCommand;
2526
private KeyCommand keyCommand;
2627

2728
/**
@@ -39,6 +40,7 @@ public MultiChainCommand(String ip, String port, String login, String password)
3940
rawTransactionCommand = new RAWTransactionCommand(ip, port, login, password);
4041
streamCommand = new StreamCommand(ip, port, login, password);
4142
walletTransactionCommand = new WalletTransactionCommand(ip, port, login, password);
43+
walletCommand = new WalletCommand(ip, port, login, password);
4244
keyCommand = new KeyCommand(ip, port, login, password);
4345
}
4446

@@ -200,4 +202,11 @@ public void setKeyCommand(KeyCommand keyCommand) {
200202
this.keyCommand = keyCommand;
201203
}
202204

205+
public WalletCommand getWalletCommand() {
206+
return walletCommand;
207+
}
208+
209+
public void setWalletCommand(WalletCommand walletCommand) {
210+
this.walletCommand = walletCommand;
211+
}
203212
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package multichain.command;
2+
3+
import multichain.command.builders.QueryBuilderWallet;
4+
import multichain.command.builders.QueryBuilderWalletTransaction;
5+
import multichain.command.tools.MultichainTestParameter;
6+
import multichain.object.*;
7+
import multichain.object.formatters.TransactionFormatter;
8+
import multichain.object.formatters.TxOutFormatter;
9+
import multichain.object.formatters.WalletFormatter;
10+
import multichain.object.formatters.WalletTransactionFormatter;
11+
12+
import java.util.ArrayList;
13+
import java.util.Arrays;
14+
import java.util.List;
15+
16+
public class WalletCommand extends QueryBuilderWallet {
17+
18+
public WalletCommand(String ip, String port, String login, String password) {
19+
initialize(ip, port, login, password);
20+
}
21+
22+
public WalletInfo getWalletInfo() throws MultichainException {
23+
WalletInfo walletInfo = new WalletInfo();
24+
25+
Object objectWalletInfo = executeGetWalletInfo();
26+
walletInfo = WalletFormatter.formatWalletInfo(objectWalletInfo);
27+
28+
return walletInfo;
29+
}
30+
31+
protected Object executeGetWalletInfo() throws MultichainException {
32+
return execute(CommandEnum.GETWALLETINFO);
33+
}
34+
35+
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ protected enum CommandEnum {
8888
GETTXOUTDATA,
8989
GETUNCONFIRMEDBALANCE,
9090
GETWALLETTRANSACTION,
91+
GETWALLETINFO,
9192
GRANT,
9293
GRANTFROM,
9394
GRANTWITHMETADATA,
@@ -154,12 +155,12 @@ protected void initialize(String ip, String port, String login, String password)
154155
}
155156

156157
/**
157-
*
158+
*
158159
* @param command
159160
* @param parameters
160-
*
161+
*
161162
* @return
162-
*
163+
*
163164
* example :
164165
* MultichainQueryBuidlder.executeProcess(MultichainCommand
165166
* .SENDTOADDRESS,"1EyXuq2JVrj4E3CpM9iNGNSqBpZ2iTPdwGKgvf

0 commit comments

Comments
 (0)