Merge pull request #46 from ostdotcom/develop

merging develop to release-2.0

Author: puneet-khushwani-eth

.travis.yml

@@ -15,7 +15,6 @@ notifications:
     on_failure: always
 branches:
   only:
-  - master
   - develop
   - /^release-.*/
 script:

lib/config.rb

@@ -4,7 +4,7 @@ class Config
   API_KEY = ENV['OST_KIT_API_KEY']
   API_SECRET = ENV['OST_KIT_API_SECRET']
   OST_SDK = OSTSdk::Saas::Services.new({api_key: API_KEY, api_secret: API_SECRET,
-                                        api_base_url: API_BASE_URL, config: {timeout: 10}, api_spec: false})
+                                        api_base_url: API_BASE_URL, config: {timeout: 60}, api_spec: false})
 
   OST_KIT_COMPANY_USER_ID = ENV['OST_KIT_COMPANY_USER_ID']
   OST_KIT_AUX_CHAIN_ID = ENV['OST_KIT_AUX_CHAIN_ID']

lib/ost-sdk-ruby/util/http_helper.rb

@@ -23,7 +23,7 @@ def initialize(params)
         @api_key = params[:api_key]
         @api_secret = params[:api_secret]
         @api_spec = params[:api_spec]
-        @timeout = 10
+        @timeout = 60
         if (params.key?(:config))
           config = params[:config]
           if (config.key?(:timeout))