zold 0.11.8 → 0.11.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73c4792176a13df605a885ea46e4cb92b0df76c6
-  data.tar.gz: 6ca3f32b2975db9dcf533aeb746e80e775224427
+  metadata.gz: bbeb43337cb9f0a00e30ea6898f5a03636fcf1bb
+  data.tar.gz: d141288a3fbeee753c6e8e961a63d9932086442d
 SHA512:
-  metadata.gz: 6982d8437738d658d3d530c69525a501cc409237d2ae42c8affe8edc046636e83e06ae1cb51d0fbe8cefa0da9ae30e1a2da43a72c19037b721c631cb765fee73
-  data.tar.gz: 14a0e10962910847fea075ea48b26063e2baac9ed91e1b46453cee53764ebbc641b773bb0de5d8aeb854881852941bad46a15e208e379b5f266017da98d8ce33
+  metadata.gz: 2aa295616ec945fbdf1106b741021c55bfb8f84200d9934d27a00324abf1fed3c4c54432f06f3943f8f46c625bf02cce079a55b813541fddfef12b0872e41456
+  data.tar.gz: 98225c2ffc7f126586241e62177c6c293d7c43e78c610843b4f462ca46f5552374d38849e33a18bc33f3088118fcb9f22a6102176779b56b6af3bf82d3967e6e

data/lib/zold/commands/fetch.rb

@@ -86,7 +86,9 @@ Available options:"
       json = JSON.parse(res.body)
       score = Score.parse_json(json['score'])
       r.assert_valid_score(score)
-      raise "Score is too weak #{score.strength}" if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
+      r.assert_score_ownership(score)
+      r.assert_score_strength(score)
+      r.assert_score_strength(score) unless opts['ignore-score-weakness']
       Tempfile.open do |f|
         body = json['body']
         File.write(f, body)

data/lib/zold/commands/push.rb

@@ -69,7 +69,7 @@ Available options:"
       @remotes.iterate(@log) do |r|
         total += push_one(wallet, r, opts)
       end
-      @log.info("Total score for #{wallet.id} is #{total}")
+      @log.info("Push finished, total score for #{wallet.id} is #{total}")
     end
 
     def push_one(wallet, r, opts)
@@ -88,7 +88,8 @@ Available options:"
       json = JSON.parse(response.body)
       score = Score.parse_json(json['score'])
       r.assert_valid_score(score)
-      raise "Score is too weak #{score}" if score.strength < Score::STRENGTH
+      r.assert_score_ownership(score)
+      r.assert_score_strength(score)
       @log.info("#{r} accepted #{content.length}b/#{wallet.txns.count}t of #{wallet.id} \
 in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
       score.value

data/lib/zold/commands/remote.rb

@@ -155,8 +155,8 @@ Available options:"
         json = JSON.parse(res.body)
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
-        raise "Score too weak: #{score.strength}" if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
-        raise "Masqueraded as #{score.host}:#{score.port}" if r.host != score.host || r.port != score.port
+        r.assert_score_ownership(score)
+        r.assert_score_strength(score) unless opts['ignore-score-weakness']
         @remotes.rescore(score.host, score.port, score.value)
         if opts['reboot'] && Semantic::Version.new(VERSION) < Semantic::Version.new(json['version'])
           @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \

data/lib/zold/commands/taxes.rb

@@ -123,7 +123,7 @@ Available options:"
         json = JSON.parse(res.body)
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
-        raise "Score is too weak (<#{Score::STRENGTH}) #{score}" if score.strength < Score::STRENGTH
+        r.assert_score_strength(score)
         raise "Score is too small (<#{Tax::EXACT_SCORE})" if score.value < Tax::EXACT_SCORE
         @log.info("#{r}: #{Rainbow(score.value).green}")
         best << score

data/lib/zold/node/entrance.rb

@@ -101,11 +101,16 @@ module Zold
 
     # Returns a list of modifed wallets (as Zold::Id)
     def push_sync(id, body)
-      @semaphores.put_if_absent(id, Mutex.new)
-      @semaphores.get(id).synchronize do
+      @semaphores.put_if_absent(id.to_s, Mutex.new)
+      @semaphores.get(id.to_s).synchronize do
         start = Time.now
         modified = push_unsafe(id, body)
-        @log.info("Accepted #{id} in #{(Time.now - start) / 60}s and modified #{modified.join(', ')}")
+        if modified.empty?
+          @log.info("Accepted #{id} in #{((Time.now - start) / 60).round(2)}s \
+and modified nothing (this is most likely a bug!)")
+        else
+          @log.info("Accepted #{id} in #{((Time.now - start) / 60).round(2)}s and modified #{modified.join(', ')}")
+        end
         modified
       end
     end
@@ -113,7 +118,8 @@ module Zold
     # Returns a list of modifed wallets (as Zold::Id)
     def push_unsafe(id, body)
       copies = Copies.new(File.join(@copies, id.to_s))
-      copies.add(body, '0.0.0.0', Remotes::PORT, 0)
+      localhost = '0.0.0.0'
+      copies.add(body, localhost, Remotes::PORT, 0)
       Fetch.new(
         wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
       ).run(['fetch', id.to_s, "--ignore-node=#{@address}"])
@@ -121,7 +127,7 @@ module Zold
         wallets: @wallets, copies: copies.root, log: @log
       ).run(['merge', id.to_s])
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
-      copies.remove('remote', Remotes::PORT)
+      copies.remove(localhost, Remotes::PORT)
       @push_mutex.synchronize { @modified += modified }
       @pushes.post { push_one } if @pushes.length < 2
       modified
@@ -130,6 +136,7 @@ module Zold
     def push_one
       @push_mutex.synchronize do
         id = @modified.to_a[0]
+        @modified.delete(id)
         return if id.nil?
         Push.new(
           wallets: @wallets, remotes: @remotes, log: @log

data/lib/zold/remotes.rb

@@ -53,7 +53,9 @@ module Zold
       attr_reader :host, :port
       def initialize(host, port, score, log: Log::Quiet.new)
         @host = host
+        raise 'Post must be Integer' unless port.is_a?(Integer)
         @port = port
+        raise 'Score must be of type Score' unless score.is_a?(Score)
         @score = score
         @log = log
       end
@@ -79,6 +81,15 @@ module Zold
         raise "Invalid score #{score}" unless score.valid?
         raise "Expired score #{score}" if score.expired?
       end
+
+      def assert_score_ownership(score)
+        raise "Masqueraded host #{@host} as #{score.host}: #{score}" if @host != score.host
+        raise "Masqueraded port #{@port} as #{score.port}: #{score}" if @port != score.port
+      end
+
+      def assert_score_strength(score)
+        raise "Score is too weak #{score.strength}" if score.strength < Score::STRENGTH
+      end
     end
 
     def initialize(file)

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.11.8'.freeze
+  VERSION = '0.11.9'.freeze
 end

data/test/commands/test_fetch.rb

@@ -46,18 +46,18 @@ class TestFetch < Minitest::Test
       wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
       remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
       remotes.clean
-      stub_request(:get, "http://fake-1/wallet/#{id}").to_return(
+      stub_request(:get, "http://localhost:80/wallet/#{id}").to_return(
         status: 200,
         body: {
           'score': Zold::Score::ZERO.to_h,
           'body': File.read(wallet.path)
         }.to_json
       )
-      stub_request(:get, "http://fake-2/wallet/#{id}").to_return(
+      stub_request(:get, "http://localhost:81/wallet/#{id}").to_return(
         status: 404
       )
-      remotes.add('fake-1', 80)
-      remotes.add('fake-2', 80)
+      remotes.add('localhost', 80)
+      remotes.add('localhost', 81)
       copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
       Zold::Fetch.new(wallets: wallets, copies: copies.root, remotes: remotes, log: test_log).run(
         ['fetch', '--ignore-score-weakness', id.to_s]
@@ -73,14 +73,14 @@ class TestFetch < Minitest::Test
       wallets = Zold::Wallets.new(dir)
       remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
       remotes.clean
-      stub_request(:get, "http://fake-1/wallet/#{id}").to_return(
+      stub_request(:get, "http://localhost:80/wallet/#{id}").to_return(
         status: 200,
         body: {
           'score': Zold::Score::ZERO.to_h,
           'body': 'the body'
         }.to_json
       )
-      remotes.add('fake-1', 80)
+      remotes.add('localhost', 80)
       copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
       Zold::Fetch.new(
         wallets: wallets, copies: copies.root, remotes: remotes, log: test_log

data/test/node/fake_node.rb

@@ -47,7 +47,7 @@ class FakeNode
           Zold::Node.new(log: @log).run(
             [
               '--port', port.to_s,
-              '--host=locahost',
+              '--host=localhost',
               '--bind-port', port.to_s,
               '--threads=1',
               '--home', home,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.9
 platform: ruby
 authors:
 - Yegor Bugayenko