zold 0.14.8 → 0.14.9

data/test/test_id.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_metronome.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_prefixes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_remotes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -139,6 +141,15 @@ class TestRemotes < Minitest::Test
     end
   end
 
+  def test_tolerates_invalid_requests
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'remotes')
+      remotes = Zold::Remotes.new(file)
+      remotes.error('127.0.0.1', 1024)
+      remotes.rescore('127.0.0.1', 1024, 15)
+    end
+  end
+
   def test_modifies_from_many_threads
     Dir.mktmpdir 'test' do |dir|
       remotes = Zold::Remotes.new(File.join(dir, 'a.csv'))

data/test/test_score.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -31,9 +33,9 @@ require_relative '../lib/zold/score'
 class TestScore < Minitest::Test
   def test_reduces_itself
     score = Zold::Score.new(
-      Time.parse('2017-07-19T21:24:51Z'),
-      'localhost', 443, 'NOPREFIX@ffffffffffffffff',
-      %w[A B C D E F G]
+      time: Time.parse('2017-07-19T21:24:51Z'),
+      host: 'localhost', port: 443, invoice: 'NOPREFIX@ffffffffffffffff',
+      suffixes: %w[A B C D E F G]
     ).reduced(2)
     assert_equal(2, score.value)
     assert_equal(64, score.hash.length)
@@ -41,8 +43,8 @@ class TestScore < Minitest::Test
 
   def test_drops_to_zero_when_expired
     score = Zold::Score.new(
-      Time.now - 24 * 60 * 60,
-      'some-host', 9999, 'NOPREFIX@ffffffffffffffff',
+      time: Time.now - 24 * 60 * 60,
+      host: 'some-host', port: 9999, invoice: 'NOPREFIX@ffffffffffffffff',
       strength: 50
     ).next
     assert(score.valid?)
@@ -52,9 +54,9 @@ class TestScore < Minitest::Test
 
   def test_validates_wrong_score
     score = Zold::Score.new(
-      Time.parse('2017-07-19T21:24:51Z'),
-      'localhost', 443, 'NOPREFIX@ffffffffffffffff',
-      %w[xxx yyy zzz]
+      time: Time.parse('2017-07-19T21:24:51Z'),
+      host: 'localhost', port: 443, invoice: 'NOPREFIX@ffffffffffffffff',
+      suffixes: %w[xxx yyy zzz]
     )
     assert_equal(3, score.value)
     assert(!score.valid?)
@@ -62,8 +64,8 @@ class TestScore < Minitest::Test
 
   def test_prints_mnemo
     score = Zold::Score.new(
-      Time.parse('2017-07-19T22:32:51Z'),
-      'localhost', 443, 'NOPREFIX@ffffffffffffffff'
+      time: Time.parse('2017-07-19T22:32:51Z'),
+      host: 'localhost', port: 443, invoice: 'NOPREFIX@ffffffffffffffff'
     )
     assert_equal('0:2232', score.to_mnemo)
   end
@@ -72,7 +74,7 @@ class TestScore < Minitest::Test
     time = Time.now
     score = Zold::Score.parse(
       Zold::Score.new(
-        time, 'localhost', 999, 'NOPREFIX@ffffffffffffffff',
+        time: time, host: 'localhost', port: 999, invoice: 'NOPREFIX@ffffffffffffffff',
         strength: 1
       ).next.next.to_s
     )
@@ -86,7 +88,7 @@ class TestScore < Minitest::Test
     time = Time.now
     score = Zold::Score.parse_text(
       Zold::Score.new(
-        time, 'a.example.com', 999, 'NOPREFIX@ffffffffffffffff',
+        time: time, host: 'a.example.com', port: 999, invoice: 'NOPREFIX@ffffffffffffffff',
         strength: 1
       ).next.next.next.to_text
     )
@@ -100,7 +102,7 @@ class TestScore < Minitest::Test
     time = Time.now
     score = Zold::Score.parse_text(
       Zold::Score.new(
-        time, '192.168.0.1', 1, 'NOPREFIX@ffffffffffffffff', []
+        time: time, host: '192.168.0.1', port: 1, invoice: 'NOPREFIX@ffffffffffffffff', suffixes: []
       ).to_text
     )
     assert_equal(0, score.value)
@@ -111,7 +113,7 @@ class TestScore < Minitest::Test
     time = Time.now
     score = Zold::Score.parse(
       Zold::Score.new(
-        time, '192.168.0.1', 1, 'NOPREFIX@ffffffffffffffff', []
+        time: time, host: '192.168.0.1', port: 1, invoice: 'NOPREFIX@ffffffffffffffff', suffixes: []
       ).to_s
     )
     assert_equal(0, score.value)
@@ -120,8 +122,8 @@ class TestScore < Minitest::Test
 
   def test_finds_next_score
     score = Zold::Score.new(
-      Time.now, 'localhost', 443,
-      'NOPREFIX@ffffffffffffffff', strength: 2
+      time: Time.now, host: 'localhost', port: 443,
+      invoice: 'NOPREFIX@ffffffffffffffff', strength: 2
     ).next.next.next
     assert_equal(3, score.value)
     assert(score.valid?)
@@ -130,29 +132,29 @@ class TestScore < Minitest::Test
 
   def test_dont_expire_correctly
     score = Zold::Score.new(
-      Time.now - 10 * 60 * 60, 'localhost', 443,
-      'NOPREFIX@ffffffffffffffff', strength: 2
+      time: Time.now - 10 * 60 * 60, host: 'localhost', port: 443,
+      invoice: 'NOPREFIX@ffffffffffffffff', strength: 2
     ).next.next.next
     assert(!score.expired?)
   end
 
   def test_correct_number_of_zeroes
     score = Zold::Score.new(
-      Time.now, 'localhost', 443,
-      'NOPREFIX@ffffffffffffffff', strength: 3
+      time: Time.now, host: 'localhost', port: 443,
+      invoice: 'NOPREFIX@ffffffffffffffff', strength: 3
     ).next
     assert(score.hash.end_with?('000'))
   end
 
   def test_generates_hash_correctly
     score = Zold::Score.new(
-      Time.parse('2018-06-27T06:22:41Z'), 'b2.zold.io', 4096,
-      'THdonv1E@abcdabcdabcdabcd', ['3a934b']
+      time: Time.parse('2018-06-27T06:22:41Z'), host: 'b2.zold.io', port: 4096,
+      invoice: 'THdonv1E@abcdabcdabcdabcd', suffixes: ['3a934b']
     )
     assert_equal('c9c72efbf6beeea13408c5e720ec42aec017c11c3db335e05595c03755000000', score.hash)
     score = Zold::Score.new(
-      Time.parse('2018-06-27T06:22:41Z'), 'b2.zold.io', 4096,
-      'THdonv1E@abcdabcdabcdabcd', %w[3a934b 1421217]
+      time: Time.parse('2018-06-27T06:22:41Z'), host: 'b2.zold.io', port: 4096,
+      invoice: 'THdonv1E@abcdabcdabcdabcd', suffixes: %w[3a934b 1421217]
     )
     assert_equal('e04ab4e69f86aa17be1316a52148e7bc3187c6d3df581d885a862d8850000000', score.hash)
   end

data/test/test_signature.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_tax.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -72,8 +74,8 @@ class TestTax < Minitest::Test
       invoice = "#{Zold::Prefixes.new(target).create}@#{target.id}"
       tax = Zold::Tax.new(wallet)
       score = Zold::Score.new(
-        Time.now, 'localhost', 80, invoice,
-        %w[A B C D E F G H I J K L M N O P Q R S T U V]
+        time: Time.now, host: 'localhost', port: 80, invoice: invoice,
+        suffixes: %w[A B C D E F G H I J K L M N O P Q R S T U V]
       )
       tax.pay(Zold::Key.new(file: 'fixtures/id_rsa'), score)
       assert(

data/test/test_txn.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_upgrades.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_verbose_thread.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'semantic'
 require 'zold/version'
 require 'minitest/autorun'

data/test/test_wallet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_wallets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/test_zold.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/test/upgrades/test_protocol_up.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/upgrades/2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/upgrades/protocol_up.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/upgrades/rename_foreign_wallets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/zold.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2018 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -28,7 +30,7 @@ Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '2.2'
-  s.required_ruby_version = '~>2.2'
+  s.required_ruby_version = '>=2.3.3'
   s.name = 'zold'
   s.version = Zold::VERSION
   s.license = 'MIT'
@@ -55,6 +57,8 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'concurrent-ruby', '~>1.0'
   s.add_runtime_dependency 'cucumber', '~>3.1' # has to stay here for Heroku
   s.add_runtime_dependency 'diffy', '~>3.2'
+  s.add_runtime_dependency 'dry-struct', '~>0.5.0'
+  s.add_runtime_dependency 'dry-types', '~>0.13.2'
   s.add_runtime_dependency 'json', '~>1.8'
   s.add_runtime_dependency 'openssl', '~>2.1'
   s.add_runtime_dependency 'rainbow', '~>3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.8
+  version: 0.14.9
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: dry-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -350,10 +378,12 @@ files:
 - fixtures/merge/simple-case/copies/0123456789abcdef/scores.z
 - fixtures/scripts/_head.sh
 - fixtures/scripts/calculate-scores.sh
+- fixtures/scripts/distribute-wallet.sh
 - fixtures/scripts/print-helps.sh
 - fixtures/scripts/push-and-pull.sh
 - fixtures/scripts/redeploy-on-upgrade.sh
 - fixtures/scripts/sigdump.sh
+- fixtures/scripts/spread-wallets.sh
 - heroku-run.sh
 - lib/zold.rb
 - lib/zold/amount.rb
@@ -375,6 +405,7 @@ files:
 - lib/zold/commands/pull.rb
 - lib/zold/commands/push.rb
 - lib/zold/commands/remote.rb
+- lib/zold/commands/routines/bonuses.rb
 - lib/zold/commands/routines/reconnect.rb
 - lib/zold/commands/routines/spread.rb
 - lib/zold/commands/show.rb
@@ -402,6 +433,7 @@ files:
 - lib/zold/signature.rb
 - lib/zold/tax.rb
 - lib/zold/txn.rb
+- lib/zold/type.rb
 - lib/zold/upgrades.rb
 - lib/zold/verbose_thread.rb
 - lib/zold/version.rb
@@ -409,6 +441,7 @@ files:
 - lib/zold/wallet.rb
 - lib/zold/wallets.rb
 - resources/remotes
+- test/commands/routines/test_bonuses.rb
 - test/commands/routines/test_reconnect.rb
 - test/commands/routines/test_spread.rb
 - test/commands/test_alias.rb
@@ -476,9 +509,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -495,6 +528,7 @@ test_files:
 - features/gem_package.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- test/commands/routines/test_bonuses.rb
 - test/commands/routines/test_reconnect.rb
 - test/commands/routines/test_spread.rb
 - test/commands/test_alias.rb