From 7d3783b5a0cfc2ded2dc1a403ae868359a3cf13f Mon Sep 17 00:00:00 2001 From: GME Date: Fri, 7 Jun 2019 13:42:38 +0200 Subject: [PATCH] correction --- src/main/java/blockchain/configuration/AppConfig.java | 2 +- src/main/java/database/DatabaseHelper.java | 4 ++-- src/test/java/blockchain/query/User/ReadUserTest.java | 2 +- src/test/java/blockchain/query/User/RegisterUserTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/blockchain/configuration/AppConfig.java b/src/main/java/blockchain/configuration/AppConfig.java index 6cf8095..c96c502 100644 --- a/src/main/java/blockchain/configuration/AppConfig.java +++ b/src/main/java/blockchain/configuration/AppConfig.java @@ -33,7 +33,7 @@ public class AppConfig { // CHAINCODE public static String getCHAINCODE(){ if(CHAINCODE_IDX==0){ - return "monnethic-prod"; + return "monnethic_prod"; }else { return "monnethic_qa"; } diff --git a/src/main/java/database/DatabaseHelper.java b/src/main/java/database/DatabaseHelper.java index 4a37786..7a5e3dd 100644 --- a/src/main/java/database/DatabaseHelper.java +++ b/src/main/java/database/DatabaseHelper.java @@ -7,13 +7,13 @@ import com.j256.ormlite.support.ConnectionSource; public class DatabaseHelper { private static final String DATABASE_USER = "monnethicadmin"; private static final String DATABASE_PWD = "vHEQszGXcJ6;/)}z!V"; - private final static String DATABASE_URL = "jdbc:postgresql://37.187.101.44:5432/"+AppConfig.getDATABASE(); + private final static String DATABASE_URL = "jdbc:postgresql://37.187.101.44:5432/"; private static JdbcConnectionSource jdbcConnectionSource; public ConnectionSource setupDatabaseConnection(){ try{ - jdbcConnectionSource = new JdbcConnectionSource(DATABASE_URL, DATABASE_USER, DATABASE_PWD); + jdbcConnectionSource = new JdbcConnectionSource(DATABASE_URL+AppConfig.getDATABASE(), DATABASE_USER, DATABASE_PWD); return jdbcConnectionSource; }catch (Exception e){ System.out.print("\n"+e.getMessage()); diff --git a/src/test/java/blockchain/query/User/ReadUserTest.java b/src/test/java/blockchain/query/User/ReadUserTest.java index 9afa9a3..76b01a9 100644 --- a/src/test/java/blockchain/query/User/ReadUserTest.java +++ b/src/test/java/blockchain/query/User/ReadUserTest.java @@ -22,7 +22,7 @@ public class ReadUserTest { try{ QueryWrapper queryWrapper = new QueryWrapper(); String functionName = "readUser"; - String[] args = new String[]{"$2a$10$TIKsB3t5BoA6dOLptaYJYusQSvjMag8ODepI9lZsMlNNVBB0VCTEi"}; + String[] args = new String[]{"$2a$10$txHyi9ZOO0U6RLLOOQCWM.L8xafduYcFHHE93Prfu/VtV8h6EyaJm"}; String response = queryWrapper.sendQuery(functionName,args); if(response != null){ JsonReader reader = Json.createReader(new StringReader(response)); diff --git a/src/test/java/blockchain/query/User/RegisterUserTest.java b/src/test/java/blockchain/query/User/RegisterUserTest.java index 8ed7122..caf0034 100644 --- a/src/test/java/blockchain/query/User/RegisterUserTest.java +++ b/src/test/java/blockchain/query/User/RegisterUserTest.java @@ -18,7 +18,7 @@ public class RegisterUserTest { try { TransactionWrapper transactionWrapper = new TransactionWrapper(); String functionName = "registerUser"; - String[] args = new String[]{"usera","Thomas","MEUNIER","0000000000","gonette"}; + String[] args = new String[]{"$2a$10$txHyi9ZOO0U6RLLOOQCWM.L8xafduYcFHHE93Prfu/VtV8h6EyaJm","QPk7/bB7kkxbwHoQ5UhxIw==","fBunq4eRLXDvrDUUmtWYCw==","JOdbTStvgKDN/OqvFz21NQ==","gonette"}; BlockEvent.TransactionEvent responseEvent = transactionWrapper.sendTransaction(functionName,args); logger.info("Event transaction id : "+responseEvent.getTransactionID()); //print transaction id }catch (Exception e){