stellar_spectrum 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bde5c4526ef6395789a0f36643e1b172f2ee39b27d92783ae33c90f361ccccf
-  data.tar.gz: 4fabffb86d4194e6c278c91aabbd57027561101f025e91c0760d01f59ed95c23
+  metadata.gz: a03e0f25c992788e8b3f4b13713ab69d23331e3194bd5e61f2e53550c3226df9
+  data.tar.gz: cceb241d7e1f988857ee682e81f1a56f41f02af198d200d685f378a7e8c1594a
 SHA512:
-  metadata.gz: e59d089d618d4957a4b1c1f853b329f484ccf50289b59c811af883720996fdab88a6d2856318971b5fcaecc1678d164d5e33ef349199cb2be677565ac7f59fa6
-  data.tar.gz: 4546b8bd18f5f460d761d687d93a95e8423d5105b2dff88775b0e1bf534b7d353eb16526daefa40ae166522520219225c7bc3db7658e8422872f11dbaecb8054
+  metadata.gz: bac931885f03c9ee063ab57e164c642f707e5d5498eef5ba3db341692f9db17b0aceb161b7f240a3434a5385969d59dfa34d2524cbe0a4087026ae1730ba91a5
+  data.tar.gz: 1aec0f8499eddc6698df89fdf6792a7135d288d30029706bad79a782dac7c1a8bb6dbc81738a01cbeb32cb57de6a5efd6b739af2d117bc705dec1cfb64a26361

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2019-01-29
+### Fixed
+- Do not retry forever (and hitting the stack limit)
+
+### Added
+- `max_tries` configuration setting
+
 ## [1.2.0] - 2019-01-18
 ### Added
 - Retry calls to Stellar horizon API regardless of the type of error code it receives.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stellar_spectrum (1.2.0)
+    stellar_spectrum (1.3.0)
       activesupport
       gem_config
       light-service
@@ -38,7 +38,7 @@ GEM
       net-http-digest_auth (~> 1.4)
     faraday_hal_middleware (0.1.0)
       faraday_middleware (~> 0.9)
-    faraday_middleware (0.12.2)
+    faraday_middleware (0.13.0)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.10.0)
     gem_config (0.3.1)
@@ -50,7 +50,7 @@ GEM
       faraday_middleware
       net-http-digest_auth
       uri_template
-    i18n (1.5.2)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     light-service (0.11.0)
       activesupport (>= 3.0)
@@ -66,7 +66,7 @@ GEM
       pry (~> 0.10)
     public_suffix (3.0.3)
     rake (10.5.0)
-    rbnacl (6.0.0)
+    rbnacl (6.0.1)
       ffi
     redis (4.1.0)
     rspec (3.8.0)

data/lib/stellar_spectrum.rb

@@ -7,6 +7,7 @@ require "redis"
 require "active_support/core_ext/hash/except"
 require "active_support/core_ext/object/blank"
 require 'active_support/core_ext/integer/inflections'
+require "stellar_spectrum/services/fibo"
 require "stellar_spectrum/services/get_available_channels"
 require "stellar_spectrum/services/get_channel_account_info"
 require "stellar_spectrum/services/get_channel_accounts"
@@ -32,11 +33,16 @@ module StellarSpectrum
 
   include GemConfig::Base
 
+  # 17 tries means this gem will try up to about 17 times before
+  # giving up, and letting the error bubble up
+  DEFAULT_MAX_TRIES = 17.freeze
+
   with_configuration do
     has :redis_url, classes: [NilClass, String]
     has :seeds, classes: [NilClass, Array]
     has :horizon_url, classes: [NilClass, String]
     has :logger
+    has :max_tries, classes: [Integer], default: DEFAULT_MAX_TRIES
   end
 
   def self.new(*args)

data/lib/stellar_spectrum/services/fibo.rb

@@ -0,0 +1,15 @@
+module StellarSpectrum
+  class Fibo
+
+    def self.call(n)
+      return n if n <= 1
+
+      @cache ||= {}
+      cached_value = @cache[n]
+      return cached_value unless cached_value.nil?
+
+      @cache[n] = self.(n-1) + self.(n-2)
+    end
+
+  end
+end

data/lib/stellar_spectrum/services/sending_payment/retry.rb

@@ -18,10 +18,9 @@ module StellarSpectrum
       ]
       expects *EXPECTS
       promises :send_asset_response
-      WAIT_TIME_IN_SECONDS = 5
 
       executed do |c|
-        sleep WAIT_TIME_IN_SECONDS
+        sleep Fibo.(c.tries)
 
         args = EXPECTS.each_with_object({}) do |attr, hash|
           hash[attr] = c.send(attr)

data/lib/stellar_spectrum/services/sending_payment/send_asset.rb

@@ -30,6 +30,8 @@ module StellarSpectrum
           sequence: c.next_sequence_number,
         )
       rescue Faraday::ClientError => e
+        fail if c.tries >= StellarSpectrum.configuration.max_tries
+
         Log.warn("Retrying SendingPayment::SendAsset - #{e.inspect}")
         retry_result = Retry.execute(
           stellar_client: c.stellar_client,

data/lib/stellar_spectrum/version.rb

@@ -1,3 +1,3 @@
 module StellarSpectrum
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stellar_spectrum
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ramon Tayag
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -175,6 +175,7 @@ files:
 - docker-compose.yml
 - lib/stellar_spectrum.rb
 - lib/stellar_spectrum/client.rb
+- lib/stellar_spectrum/services/fibo.rb
 - lib/stellar_spectrum/services/get_available_channels.rb
 - lib/stellar_spectrum/services/get_channel_account_info.rb
 - lib/stellar_spectrum/services/get_channel_accounts.rb
@@ -221,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Use Stellar payment channels in Ruby with ease