Merge pull request #26 from ostdotcom/pre_release

merging pre_release into develop.

Author: puneet-khushwani-eth

.travis.yml

@@ -14,7 +14,6 @@ notifications:
 sudo: false
 branches:
   only:
-  - master
   - develop
   - /^release-.*/
 script: mvn clean verify

README.md

@@ -82,7 +82,7 @@ sdkConfig.put("apiSecret","[YOUR_API_SECRET]");
 HashMap <String,Object> nestedparam = new HashMap<String,Object>();
 // This is the timeout in seconds for which the socket connection will remain open
 // The value of timeout will always be of type long
-nestedparam.put("timeout", (long) 15);
+nestedparam.put("timeout", (long) 60);
 sdkConfig.put("config", nestedparam);
 
 OSTSDK ostObj = new OSTSDK(sdkConfig);
@@ -414,12 +414,12 @@ arrayListAmount.add(amount);
 Gson gsonObj = new Gson();
 String tokenHolderSender = "0xa9632350057c2226c5a10418b1c3bc9acdf7e2ee";
 String payCurrencyCode = "USD";
-String ostToUsdInWei = "23757000000000000";
+String ostToUsd = "23757000000000000";
 nestedarraylist.add(tokenHolderSender);
 nestedarraylist.add(arrayListForUser2TokenHolderAddress);
 nestedarraylist.add(arrayListAmount);
 nestedarraylist.add(payCurrencyCode);
-nestedarraylist.add(ostToUsdInWei);
+nestedarraylist.add(ostToUsd);
 nestedparams.put("parameters", nestedarraylist);
 String jsonStr = gsonObj.toJson(nestedparams);
 params.put("raw_calldata", jsonStr);

src/main/java/com/ost/lib/OSTRequestClient.java

@@ -71,8 +71,8 @@ public OSTRequestClient( Map<String,Object> params) {
         Object apiSecret = params.get("apiSecret");
         Object apiEndpoint = params.get("apiEndpoint");
 
-        //default timeout is 10 seconds for socket connection
-        long timeout = (long) 10;
+        //default timeout is 60 seconds for socket connection
+        long timeout = (long) 60;
         if(params.containsKey("config"))
         {
             HashMap<String, Object> config = (HashMap<String, Object>) params.get("config");
@@ -123,7 +123,7 @@ public OSTRequestClient( Map<String,Object> params) {
 
     private static String GET_REQUEST = "GET";
     private static String POST_REQUEST = "POST";
-    private static String SocketTimeoutExceptionString = "{'success':'false','err':{'code':'GATEWAY_TIMEOUT','internal_id':'TIMEOUT_ERROR','msg':'','error_data':[]}}";
+    private static String SocketTimeoutExceptionString = "{'success':'false','err':{'code':'GATEWAY_TIMEOUT','internal_id':'SDK(GATEWAY_TIMEOUT)','msg':'','error_data':[]}}";
 
 
     public JsonObject get(String resource, Map<String, Object> queryParams) throws IOException {