Merge branch 'features1.4/testing' into develop-1.4
This commit is contained in:
commit
decdb64136
|
@ -1,8 +1,8 @@
|
||||||
-- SEQUENCE: public."T_TRANSACTION_transactionId_seq"
|
-- SEQUENCE: public.t_transaction_id_seq"
|
||||||
|
|
||||||
-- DROP SEQUENCE public."T_TRANSACTION_transactionId_seq";
|
-- DROP SEQUENCE public."t_transaction_id_seq";
|
||||||
|
|
||||||
CREATE SEQUENCE public."T_TRANSACTION_transactionId_seq";
|
CREATE SEQUENCE public."t_transaction_id_seq";
|
||||||
|
|
||||||
ALTER SEQUENCE public."T_TRANSACTION_transactionId_seq"
|
ALTER SEQUENCE public."t_transaction_id_seq"
|
||||||
OWNER TO monnethicadmin;
|
OWNER TO monnethicadmin;
|
|
@ -4,14 +4,14 @@
|
||||||
|
|
||||||
CREATE TABLE public."T_TRANSACTION"
|
CREATE TABLE public."T_TRANSACTION"
|
||||||
(
|
(
|
||||||
"transactionId" integer NOT NULL DEFAULT nextval('"T_TRANSACTION_transactionId_seq"'::regclass),
|
"transaction_id" integer NOT NULL DEFAULT nextval('"t_transaction_id_seq"'::regclass),
|
||||||
"transactionDate" bigint NOT NULL,
|
"transaction_date" bigint NOT NULL,
|
||||||
"transactionFrom" character varying(255) COLLATE pg_catalog."default" NOT NULL,
|
"transaction_from" character varying(255) COLLATE pg_catalog."default" NOT NULL,
|
||||||
"transactionTo" character varying(255) COLLATE pg_catalog."default" NOT NULL,
|
"transaction_to" character varying(255) COLLATE pg_catalog."default" NOT NULL,
|
||||||
"transactionHash" character varying(255) COLLATE pg_catalog."default" NOT NULL,
|
"transaction_hash" character varying(255) COLLATE pg_catalog."default" NOT NULL,
|
||||||
"transactionAmount" numeric(255,5) NOT NULL,
|
"transaction_amount" numeric(255,5) NOT NULL,
|
||||||
"transactionUnit" character varying(255) COLLATE pg_catalog."default" NOT NULL,
|
"transaction_unit" character varying(255) COLLATE pg_catalog."default" NOT NULL,
|
||||||
CONSTRAINT "T_TRANSACTION_pkey" PRIMARY KEY ("transactionId")
|
CONSTRAINT "T_TRANSACTION_pkey" PRIMARY KEY ("transaction_id")
|
||||||
)
|
)
|
||||||
WITH (
|
WITH (
|
||||||
OIDS = FALSE
|
OIDS = FALSE
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class Config {
|
||||||
//public static final String CHAINCODE_NAME = "mycc";
|
//public static final String CHAINCODE_NAME = "mycc";
|
||||||
public static final String CHAINCODE_NAME = "monnethic_2";
|
public static final String CHAINCODE_NAME = "monnethic_2";
|
||||||
//public static final String CHAINCODE_NAME = "monnethic-dev-4";
|
//public static final String CHAINCODE_NAME = "monnethic-dev-4";
|
||||||
public static final String CHAINCODE_PROD = "monnethic-prod";
|
//public static final String CHAINCODE_PROD = "monnethic-prod";
|
||||||
|
|
||||||
//PEER 0
|
//PEER 0
|
||||||
public static final String ORG1_PEER_0 = "peer0.org1.example.com";
|
public static final String ORG1_PEER_0 = "peer0.org1.example.com";
|
||||||
|
|
|
@ -65,7 +65,7 @@ public class WalletDao {
|
||||||
updateBuilder.updateColumnValue("user_hash",newUserHash);
|
updateBuilder.updateColumnValue("user_hash",newUserHash);
|
||||||
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
|
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
|
||||||
updateBuilder.updateColumnValue("modification_date",timestamp.getTime());
|
updateBuilder.updateColumnValue("modification_date",timestamp.getTime());
|
||||||
updateBuilder.where().eq("walletHash",walletHash).and().eq("is_active",true);
|
updateBuilder.where().eq("wallet_hash",walletHash).and().eq("is_active",true);
|
||||||
updateBuilder.update();
|
updateBuilder.update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,100 +6,99 @@ import com.j256.ormlite.table.DatabaseTable;
|
||||||
@DatabaseTable(tableName = "T_TRANSACTION")
|
@DatabaseTable(tableName = "T_TRANSACTION")
|
||||||
public class Transaction {
|
public class Transaction {
|
||||||
@DatabaseField(generatedId = true)
|
@DatabaseField(generatedId = true)
|
||||||
private int transactionId;
|
private int transaction_id;
|
||||||
@DatabaseField(canBeNull = false)
|
@DatabaseField(canBeNull = false)
|
||||||
private long transactionDate;
|
private long transaction_date;
|
||||||
@DatabaseField(canBeNull = false)
|
@DatabaseField(canBeNull = false)
|
||||||
private String transactionFrom;
|
private String transaction_from;
|
||||||
@DatabaseField(canBeNull = false)
|
@DatabaseField(canBeNull = false)
|
||||||
private String transactionTo;
|
private String transaction_to;
|
||||||
@DatabaseField(canBeNull = false)
|
@DatabaseField(canBeNull = false)
|
||||||
private String transactionHash;
|
private String transaction_hash;
|
||||||
@DatabaseField(canBeNull = false)
|
@DatabaseField(canBeNull = false)
|
||||||
private Double transactionAmount;
|
private double transaction_amount;
|
||||||
@DatabaseField(canBeNull = false)
|
@DatabaseField(canBeNull = false)
|
||||||
private String transactionUnit;
|
private String transaction_unit;
|
||||||
|
|
||||||
public Transaction() {
|
public Transaction() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public Transaction(long transactionDate, String transactionFrom, String transactionTo, String transactionHash, Double transactionAmount, String transactionUnit) {
|
public Transaction(int transaction_id, long transaction_date, String transaction_from, String transaction_to, String transaction_hash, double transaction_amount, String transaction_unit) {
|
||||||
super();
|
this.transaction_id = transaction_id;
|
||||||
this.transactionDate = transactionDate;
|
this.transaction_date = transaction_date;
|
||||||
this.transactionFrom = transactionFrom;
|
this.transaction_from = transaction_from;
|
||||||
this.transactionTo = transactionTo;
|
this.transaction_to = transaction_to;
|
||||||
this.transactionHash = transactionHash;
|
this.transaction_hash = transaction_hash;
|
||||||
this.transactionAmount = transactionAmount;
|
this.transaction_amount = transaction_amount;
|
||||||
this.transactionUnit = transactionUnit;
|
this.transaction_unit = transaction_unit;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTransactionFrom() {
|
public int getTransaction_id() {
|
||||||
return transactionFrom;
|
return transaction_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTransactionFrom(String transactionFrom) {
|
public void setTransaction_id(int transaction_id) {
|
||||||
this.transactionFrom = transactionFrom;
|
this.transaction_id = transaction_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTransactionTo() {
|
public long getTransaction_date() {
|
||||||
return transactionTo;
|
return transaction_date;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTransactionTo(String transactionTo) {
|
public void setTransaction_date(long transaction_date) {
|
||||||
this.transactionTo = transactionTo;
|
this.transaction_date = transaction_date;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTransactionHash() {
|
public String getTransaction_from() {
|
||||||
return transactionHash;
|
return transaction_from;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTransactionHash(String transactionHash) {
|
public void setTransaction_from(String transaction_from) {
|
||||||
this.transactionHash = transactionHash;
|
this.transaction_from = transaction_from;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Double getTransactionAmount() {
|
public String getTransaction_to() {
|
||||||
return transactionAmount;
|
return transaction_to;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTransactionAmount(Double transactionAmount) {
|
public void setTransaction_to(String transaction_to) {
|
||||||
this.transactionAmount = transactionAmount;
|
this.transaction_to = transaction_to;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getTransactionId() {
|
public String getTransaction_hash() {
|
||||||
return transactionId;
|
return transaction_hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTransactionId(int id) {
|
public void setTransaction_hash(String transaction_hash) {
|
||||||
this.transactionId = transactionId;
|
this.transaction_hash = transaction_hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public double getTransaction_amount() {
|
||||||
public long getTransactionDate() {
|
return transaction_amount;
|
||||||
return transactionDate;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTransactionDate(long transactionDate) {
|
public void setTransaction_amount(double transaction_amount) {
|
||||||
this.transactionDate = transactionDate;
|
this.transaction_amount = transaction_amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTransactionUnit() {
|
public String getTransaction_unit() {
|
||||||
return transactionUnit;
|
return transaction_unit;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTransactionUnit(String transactionUnit) {
|
public void setTransaction_unit(String transaction_unit) {
|
||||||
this.transactionUnit = transactionUnit;
|
this.transaction_unit = transaction_unit;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "Transaction{" +
|
return "Transaction{" +
|
||||||
"transactionId=" + transactionId +
|
"transaction_id=" + transaction_id +
|
||||||
", transactionDate=" + transactionDate +
|
", transaction_date=" + transaction_date +
|
||||||
", transactionFrom='" + transactionFrom + '\'' +
|
", transaction_from='" + transaction_from + '\'' +
|
||||||
", transactionTo='" + transactionTo + '\'' +
|
", transaction_to='" + transaction_to + '\'' +
|
||||||
", transactionHash='" + transactionHash + '\'' +
|
", transaction_hash='" + transaction_hash + '\'' +
|
||||||
", transactionAmount=" + transactionAmount +
|
", transaction_amount=" + transaction_amount +
|
||||||
", transactionUnit='" + transactionUnit + '\'' +
|
", transaction_unit='" + transaction_unit + '\'' +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,8 +29,8 @@ public class TransactionDao {
|
||||||
public List<Transaction> getUserTransactions(String userHash)throws Exception{
|
public List<Transaction> getUserTransactions(String userHash)throws Exception{
|
||||||
transactionDao = createTransactionDaoConnection();
|
transactionDao = createTransactionDaoConnection();
|
||||||
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
||||||
queryBuilder.where().eq("transactionFrom",userHash).or().eq("transactionTo",userHash);
|
queryBuilder.where().eq("transaction_from",userHash).or().eq("transaction_to",userHash);
|
||||||
queryBuilder.orderBy("transactionDate",false);
|
queryBuilder.orderBy("transaction_date",false);
|
||||||
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
||||||
return transactionDao.query(preparedQuery);
|
return transactionDao.query(preparedQuery);
|
||||||
}
|
}
|
||||||
|
@ -38,9 +38,9 @@ public class TransactionDao {
|
||||||
public List<Transaction> getTenLastUserTransactions(String userHash)throws Exception{
|
public List<Transaction> getTenLastUserTransactions(String userHash)throws Exception{
|
||||||
transactionDao = createTransactionDaoConnection();
|
transactionDao = createTransactionDaoConnection();
|
||||||
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
||||||
queryBuilder.where().eq("transactionFrom",userHash).or().eq("transactionTo",userHash);
|
queryBuilder.where().eq("transaction_from",userHash).or().eq("transaction_to",userHash);
|
||||||
queryBuilder.limit(new Long(10));
|
queryBuilder.limit(new Long(10));
|
||||||
queryBuilder.orderBy("transactionDate",false);
|
queryBuilder.orderBy("transaction_date",false);
|
||||||
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
||||||
return transactionDao.query(preparedQuery);
|
return transactionDao.query(preparedQuery);
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,7 @@ public class TransactionDao {
|
||||||
public Transaction getTransaction(String userHash, String transactionHash)throws Exception{
|
public Transaction getTransaction(String userHash, String transactionHash)throws Exception{
|
||||||
transactionDao = createTransactionDaoConnection();
|
transactionDao = createTransactionDaoConnection();
|
||||||
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
||||||
queryBuilder.where().eq("transactionTo",userHash).or().eq("transactionFrom",userHash).and().eq("transactionHash",transactionHash);
|
queryBuilder.where().eq("transaction_to",userHash).or().eq("transaction_from",userHash).and().eq("transaction_hash",transactionHash);
|
||||||
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
||||||
return transactionDao.queryForFirst(preparedQuery);
|
return transactionDao.queryForFirst(preparedQuery);
|
||||||
}
|
}
|
||||||
|
@ -56,8 +56,8 @@ public class TransactionDao {
|
||||||
public List<Transaction> getUserSentTransaction(String userHash)throws Exception{
|
public List<Transaction> getUserSentTransaction(String userHash)throws Exception{
|
||||||
transactionDao = createTransactionDaoConnection();
|
transactionDao = createTransactionDaoConnection();
|
||||||
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
||||||
queryBuilder.where().eq("transactionFrom",userHash);
|
queryBuilder.where().eq("transaction_from",userHash);
|
||||||
queryBuilder.orderBy("transactionDate",false);
|
queryBuilder.orderBy("transaction_date",false);
|
||||||
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
||||||
return transactionDao.query(preparedQuery);
|
return transactionDao.query(preparedQuery);
|
||||||
}
|
}
|
||||||
|
@ -65,8 +65,8 @@ public class TransactionDao {
|
||||||
public List<Transaction> getUserReceivedTransaction(String userHash)throws Exception{
|
public List<Transaction> getUserReceivedTransaction(String userHash)throws Exception{
|
||||||
transactionDao = createTransactionDaoConnection();
|
transactionDao = createTransactionDaoConnection();
|
||||||
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
QueryBuilder<Transaction, String> queryBuilder = transactionDao.queryBuilder();
|
||||||
queryBuilder.where().eq("transactionTo",userHash);
|
queryBuilder.where().eq("transaction_to",userHash);
|
||||||
queryBuilder.orderBy("transactionDate",false);
|
queryBuilder.orderBy("transaction_date",false);
|
||||||
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
PreparedQuery<Transaction> preparedQuery = queryBuilder.prepare();
|
||||||
return transactionDao.query(preparedQuery);
|
return transactionDao.query(preparedQuery);
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,12 +40,12 @@ public class TransactionImplementation {
|
||||||
|
|
||||||
Transaction transaction = new Transaction();
|
Transaction transaction = new Transaction();
|
||||||
long now = Instant.now().toEpochMilli();
|
long now = Instant.now().toEpochMilli();
|
||||||
transaction.setTransactionDate(now);
|
transaction.setTransaction_date(now);
|
||||||
transaction.setTransactionFrom(sourceWalletHash);
|
transaction.setTransaction_from(sourceWalletHash);
|
||||||
transaction.setTransactionTo(destinationWalletHash);
|
transaction.setTransaction_to(destinationWalletHash);
|
||||||
transaction.setTransactionAmount(amount);
|
transaction.setTransaction_amount(amount);
|
||||||
transaction.setTransactionHash(txID);
|
transaction.setTransaction_hash(txID);
|
||||||
transaction.setTransactionUnit(transactionUnit);
|
transaction.setTransaction_unit(transactionUnit);
|
||||||
|
|
||||||
|
|
||||||
TransactionDao transactionDao = new TransactionDao();
|
TransactionDao transactionDao = new TransactionDao();
|
||||||
|
|
|
@ -82,6 +82,8 @@ public class WalletImplementation {
|
||||||
public void setBalanceToWallet(String walletHash, double amount) throws Exception {
|
public void setBalanceToWallet(String walletHash, double amount) throws Exception {
|
||||||
double newBalance = 0.0;
|
double newBalance = 0.0;
|
||||||
TransactionWrapper transactionWrapper = new TransactionWrapper();
|
TransactionWrapper transactionWrapper = new TransactionWrapper();
|
||||||
|
System.out.println("String.valueOf(amount) : "+String.valueOf(amount));
|
||||||
|
System.out.println("walletHash : "+walletHash);
|
||||||
transactionWrapper.sendTransaction("setSoldOnWallet",new String[]{walletHash,String.valueOf(amount)});
|
transactionWrapper.sendTransaction("setSoldOnWallet",new String[]{walletHash,String.valueOf(amount)});
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ public class TransactionResource {
|
||||||
public ResponseEntity saveTransaction(@Valid @RequestBody Transaction transaction){
|
public ResponseEntity saveTransaction(@Valid @RequestBody Transaction transaction){
|
||||||
TransactionImplementation transactionImplementation = new TransactionImplementation();
|
TransactionImplementation transactionImplementation = new TransactionImplementation();
|
||||||
try{
|
try{
|
||||||
HashMap mapResponse = transactionImplementation.sendTransaction(transaction.getTransactionFrom(),transaction.getTransactionTo(),transaction.getTransactionAmount(),transaction.getTransactionUnit());
|
HashMap mapResponse = transactionImplementation.sendTransaction(transaction.getTransaction_from(),transaction.getTransaction_to(),transaction.getTransaction_amount(),transaction.getTransaction_unit());
|
||||||
|
|
||||||
if(Boolean.parseBoolean(mapResponse.get("success").toString())){
|
if(Boolean.parseBoolean(mapResponse.get("success").toString())){
|
||||||
return ResponseEntity.status(HttpStatus.OK).body("{\"response\":\""+mapResponse.get("message")+"\"}");
|
return ResponseEntity.status(HttpStatus.OK).body("{\"response\":\""+mapResponse.get("message")+"\"}");
|
||||||
|
|
|
@ -71,6 +71,7 @@ public class WalletResource {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@RequestMapping(value = "/setBalance", method = RequestMethod.POST,produces = "application/json")
|
@RequestMapping(value = "/setBalance", method = RequestMethod.POST,produces = "application/json")
|
||||||
@ResponseStatus(HttpStatus.OK)
|
@ResponseStatus(HttpStatus.OK)
|
||||||
public ResponseEntity setBalance(@RequestBody Wallet wallet){
|
public ResponseEntity setBalance(@RequestBody Wallet wallet){
|
||||||
|
@ -85,6 +86,7 @@ public class WalletResource {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@RequestMapping(value = "/transfer", method = RequestMethod.POST, produces = "application/json")
|
@RequestMapping(value = "/transfer", method = RequestMethod.POST, produces = "application/json")
|
||||||
@ResponseStatus(HttpStatus.OK)
|
@ResponseStatus(HttpStatus.OK)
|
||||||
public ResponseEntity transferWallet(@RequestBody Wallet wallet){
|
public ResponseEntity transferWallet(@RequestBody Wallet wallet){
|
||||||
|
|
|
@ -24,7 +24,8 @@ public class QueryWalletByOwnerTest {
|
||||||
try{
|
try{
|
||||||
QueryWrapper queryWrapper = new QueryWrapper();
|
QueryWrapper queryWrapper = new QueryWrapper();
|
||||||
String functionName = "queryWalletsByOwner";
|
String functionName = "queryWalletsByOwner";
|
||||||
String[] args = new String[]{"$2a$10$tdkMwJ7BQSOXO2uofu/fEOlncUfuX7SsjB.2N9KVsXJUQiarAQzpG"};
|
//String[] args = new String[]{"$2a$10$tdkMwJ7BQSOXO2uofu/fEOlncUfuX7SsjB.2N9KVsXJUQiarAQzpG"};
|
||||||
|
String[] args = new String[]{"chef"};
|
||||||
String response = queryWrapper.sendQuery(functionName,args);
|
String response = queryWrapper.sendQuery(functionName,args);
|
||||||
logger.info("response : "+response);
|
logger.info("response : "+response);
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ public class ReadWalletTest {
|
||||||
try{
|
try{
|
||||||
QueryWrapper queryWrapper = new QueryWrapper();
|
QueryWrapper queryWrapper = new QueryWrapper();
|
||||||
String functionName = "readWallet";
|
String functionName = "readWallet";
|
||||||
String[] args = new String[]{"$2a$10$PuJBO70uMfzUwbQ/Qz9kTe7JYJppwetyLyP0e6JAITr3B6pQf0cbe"};
|
String[] args = new String[]{"$2a$10$B2bESpzYaYlGtuf69Y8HIu1.libPO5NGKRnatvd2R7K/vciTAj/DS"};
|
||||||
String response = queryWrapper.sendQuery(functionName,args);
|
String response = queryWrapper.sendQuery(functionName,args);
|
||||||
|
|
||||||
if(response!=null){
|
if(response!=null){
|
||||||
|
|
|
@ -115,12 +115,35 @@ public class WalletImplementationTest {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void TestSetBalance(){ //TODO
|
public void TestSetBalance(){ //TODO
|
||||||
BasicConfigurator.configure();
|
BasicConfigurator.configure();
|
||||||
WalletImplementation walletImplementation = new WalletImplementation();
|
WalletImplementation walletImplementation = new WalletImplementation();
|
||||||
try{
|
try{
|
||||||
walletImplementation.setBalanceToWallet("$2a$10$PuJBO70uMfzUwbQ/Qz9kTe7JYJppwetyLyP0e6JAITr3B6pQf0cbe",20.0);
|
walletImplementation.setBalanceToWallet("$2a$10$B2bESpzYaYlGtuf69Y8HIu1.libPO5NGKRnatvd2R7K/vciTAj/DS",20.0);
|
||||||
|
} catch (Exception e){
|
||||||
|
logger.warn("Error: "+e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void TestTransferWalelt(){ //TODO
|
||||||
|
BasicConfigurator.configure();
|
||||||
|
WalletImplementation walletImplementation = new WalletImplementation();
|
||||||
|
try{
|
||||||
|
walletImplementation.transferWallet("$2a$10$PuJBO70uMfzUwbQ/Qz9kTe7JYJppwetyLyP0e6JAITr3B6pQf0cbe","$2a$10$tdkMwJ7BQSOXO2uofu/fEOlncUfuX7SsjB.2N9KVsXJUQiarAQzpG");
|
||||||
|
} catch (Exception e){
|
||||||
|
logger.warn("Error: "+e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void TestGetUserWallet(){ //TODO
|
||||||
|
BasicConfigurator.configure();
|
||||||
|
WalletImplementation walletImplementation = new WalletImplementation();
|
||||||
|
try{
|
||||||
|
walletImplementation.getAllUserWallets("$2a$10$tdkMwJ7BQSOXO2uofu/fEOlncUfuX7SsjB.2N9KVsXJUQiarAQzpG");
|
||||||
} catch (Exception e){
|
} catch (Exception e){
|
||||||
logger.warn("Error: "+e.getMessage());
|
logger.warn("Error: "+e.getMessage());
|
||||||
}
|
}
|
||||||
|
@ -129,4 +152,5 @@ public class WalletImplementationTest {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue