stellar_spectrum 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03e0f25c992788e8b3f4b13713ab69d23331e3194bd5e61f2e53550c3226df9
-  data.tar.gz: cceb241d7e1f988857ee682e81f1a56f41f02af198d200d685f378a7e8c1594a
+  metadata.gz: e42c3edaf38084503ffb4be0c4c8444b8c1ccbe26ecd5ac15736d7dad7f07cf2
+  data.tar.gz: 6c5fadae0a06979888c64b06147299fcf563a01d58a317b3a2df968e0d8c79df
 SHA512:
-  metadata.gz: bac931885f03c9ee063ab57e164c642f707e5d5498eef5ba3db341692f9db17b0aceb161b7f240a3434a5385969d59dfa34d2524cbe0a4087026ae1730ba91a5
-  data.tar.gz: 1aec0f8499eddc6698df89fdf6792a7135d288d30029706bad79a782dac7c1a8bb6dbc81738a01cbeb32cb57de6a5efd6b739af2d117bc705dec1cfb64a26361
+  metadata.gz: 13e82996a13fc2a5a47fdc8a7be91fc7c0f87280ab081339e044ea8c214cd38c6a2182af95b0ed4f780e0285860cf8055454903c48abc49971f948d46bef3f8f
+  data.tar.gz: 012a52068e0d1883749dcfc333770713472e21fbfd2ad32a34d4d83d5fd65777bfbaf6b91bf27a3ec8771ae1dea8e53332bea7e148111da3e293e666d670b8fe

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.1] - 2019-02-16
+### Fixed
+- During retry, do not sleep more than the max lock time
+
 ## [1.3.0] - 2019-01-29
 ### Fixed
 - Do not retry forever (and hitting the stack limit)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stellar_spectrum (1.3.0)
+    stellar_spectrum (1.3.1)
       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.13.0)
+    faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.10.0)
     gem_config (0.3.1)

data/lib/stellar_spectrum.rb

@@ -25,6 +25,7 @@ require "stellar_spectrum/services/send_payment"
 require "stellar_spectrum/services/sending_payment/attempt_release_lock"
 require "stellar_spectrum/services/sending_payment/retry"
 require "stellar_spectrum/services/sending_payment/send_asset"
+require "stellar_spectrum/services/sending_payment/get_sleep_for_retry"
 require "stellar_spectrum/services/unlocking/attempt_release"
 require "stellar_spectrum/services/unlocking/check_sequence_number"
 require "stellar_spectrum/services/unlocking/unlock"

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

@@ -0,0 +1,16 @@
+module StellarSpectrum
+  module SendingPayment
+    class GetSleepForRetry
+
+      MAX = Client::MAX_LOCK_TIME_IN_SECONDS
+      LEEWAY = 5.freeze
+
+      def self.call(n)
+        fibo = Fibo.(n)
+        return fibo if fibo < MAX
+        MAX - LEEWAY
+      end
+
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module StellarSpectrum
       promises :send_asset_response
 
       executed do |c|
-        sleep Fibo.(c.tries)
+        sleep GetSleepForRetry.(c.tries)
 
         args = EXPECTS.each_with_object({}) do |attr, hash|
           hash[attr] = c.send(attr)
@@ -34,7 +34,7 @@ module StellarSpectrum
         # fail_and_return for now until we figure out a way to stop all actions
         # from reduce_if
         # See https://github.com/adomokos/light-service/pull/164
-        message = "Closing try #{c.tries}"
+        message = "Closing #{c.tries.ordinalize} try"
         c.fail_and_return! message
       end
 

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

@@ -30,9 +30,19 @@ module StellarSpectrum
           sequence: c.next_sequence_number,
         )
       rescue Faraday::ClientError => e
-        fail if c.tries >= StellarSpectrum.configuration.max_tries
+        max_tries = StellarSpectrum.configuration.max_tries
+        if c.tries >= max_tries
+          Log.warn(
+            "Surpassed maximum number of tries of #{max_tries}, " \
+            "stop retrying"
+          )
+          fail
+        end
 
-        Log.warn("Retrying SendingPayment::SendAsset - #{e.inspect}")
+        Log.warn(
+          "Retrying (#{c.tries.ordinalize} time) " \
+          "SendingPayment::SendAsset - #{e.inspect}"
+        )
         retry_result = Retry.execute(
           stellar_client: c.stellar_client,
           from: c.from,

data/lib/stellar_spectrum/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stellar_spectrum
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ramon Tayag
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -191,6 +191,7 @@ files:
 - lib/stellar_spectrum/services/pick_channel.rb
 - lib/stellar_spectrum/services/send_payment.rb
 - lib/stellar_spectrum/services/sending_payment/attempt_release_lock.rb
+- lib/stellar_spectrum/services/sending_payment/get_sleep_for_retry.rb
 - lib/stellar_spectrum/services/sending_payment/retry.rb
 - lib/stellar_spectrum/services/sending_payment/send_asset.rb
 - lib/stellar_spectrum/services/unlocking/attempt_release.rb
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Use Stellar payment channels in Ruby with ease