zold 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45f2fb7dcf69ce479ef15281f2e2ac5e60347eac
-  data.tar.gz: f177e99ee0e5925fb55a8c151301bc6d0fdfffce
+  metadata.gz: 6fcd55eac89ac43ca95643798755ef3a9ead2e5d
+  data.tar.gz: 8a002e688b432c4f1ab1c728db82488c9d8e3b50
 SHA512:
-  metadata.gz: 9444742027fab53cdbad0dbe72db8f0640c3e58a6b0c713e0f7e17dea39dc867cd9c44cdb0dfc4a695126a3ca3cd0dfa82cdf0629a560fc3f29c1dd1aec1fc48
-  data.tar.gz: 86ac46ae6fea92ea34f57a4d74ef06cbcffd7a807954ff4b74d16f541b76ac916b4222a760b1f588c63625d8aaeb5066a1b02ff3b1fb4626f8e0764579f187c3
+  metadata.gz: 7ebc8d2d233d646fe7f49c1b910a943b28353e52f4114f5b4fe6b8689481ac3823bfbe16b0e0a15a02406bcdafd444098e922dd021ae90a9af2314bd9dad708c
+  data.tar.gz: 7d6a387331acf862a6c47a0096547b019b865c367d0fd0c7d5d01c24167d974d23b6c8aa8e43d4fb66bd699c4c0c789d4261f9562e37ce8630bb931262b1118b

data/README.md

@@ -95,7 +95,7 @@ arbitrary text (has to match `[a-zA-Z0-9]+`) to the end of it and to calculate S
 in the hexadecimal format, for example:
 
 ```
-Input: "2017-07-19T21:24:51Z b1.zold.io 80 the-suffix"
+Input: "2017-07-19T21:24:51Z b1.zold.io 4096 the-suffix"
 SHA-256: "eba36e52e1ee674d198f486e07c8496853ffc8879e7fe25329523177646a96a0"
 ```
 
@@ -104,7 +104,7 @@ SHA-256 hash that ends with `00000000` (eight zeros). For example, this
 suffix `11edb424c` works (it took 212 minutes to find it on 2.3GHz Intel Core i7):
 
 ```
-Input: "2017-07-19T21:24:51Z b1.zold.io 80 11edb424c"
+Input: "2017-07-19T21:24:51Z b1.zold.io 4096 11edb424c"
 SHA-256: "34f48e0eee1ed12ad74cb39418f2f6e7442a776a7b6182697957650e00000000"
 ```
 
@@ -276,7 +276,7 @@ The directory `.zold` is automatically created and contains system data.
 these columns:
 
   * Address or IP;
-  * TPC port (usually 80);
+  * TCP port (usually 4096);
   * Score (positive integer);
   * Time of score update, ISO 8601.
 

data/bin/zold

@@ -155,7 +155,7 @@ Available options:"
     require_relative '../lib/zold/commands/fetch'
     args.each do |id|
       Zold::Fetch.new(
-        wallet: wallets.find(Zold::Id.new(id)),
+        id: Zold::Id.new(id),
         remotes: remotes,
         copies: Zold::Copies.new(File.join(copies, id)),
         log: log

data/lib/zold/commands/fetch.rb

@@ -32,8 +32,8 @@ require_relative '../score.rb'
 module Zold
   # FETCH pulling command
   class Fetch
-    def initialize(wallet:, remotes:, copies:, log: Log::Quiet.new)
-      @wallet = wallet
+    def initialize(id:, remotes:, copies:, log: Log::Quiet.new)
+      @id = id
       @remotes = remotes
       @copies = copies
       @log = log
@@ -42,7 +42,7 @@ module Zold
     def run(_ = [])
       total = 0
       @remotes.all.each do |r|
-        uri = URI("#{r[:home]}wallet/#{@wallet.id}")
+        uri = URI("#{r[:home]}wallet/#{@id}")
         res = Http.new(uri).get
         unless res.code == '200'
           @log.error("#{r[:host]}:#{r[:port]} \

data/lib/zold/commands/node.rb

@@ -37,10 +37,12 @@ module Zold
     def run(args = [])
       opts = Slop.parse(args, help: true) do |o|
         o.banner = 'Usage: zold node [options]'
-        o.integer '--port', 'TCP port to open for the Net (default: 80)',
-          default: 80
-        o.integer '--bind-port', 'TCP port to listen on (default: 80)',
-          default: 80
+        o.integer '--port',
+          "TCP port to open for the Net (default: #{Remotes::PORT})",
+          default: Remotes::PORT
+        o.integer '--bind-port',
+          "TCP port to listen on (default: #{Remotes::PORT})",
+          default: Remotes::PORT
         o.string '--host', 'Host name (default: 127.0.0.1)',
           default: '127.0.0.1'
         o.string '--home', 'Home directory (default: current directory)',

data/lib/zold/commands/remote.rb

@@ -40,6 +40,24 @@ module Zold
     end
 
     def run(args = [])
+      opts = Slop.parse(args, help: true) do |o|
+        o.banner = "Usage: zold remote <command> [options]
+Available commands:
+    #{Rainbow('remote show').green}
+      Show all registered remote nodes
+    #{Rainbow('remote clean').green}
+      Remove all registered remote nodes
+    #{Rainbow('remote reset').green}
+      Restore it back to the default list of nodes
+    #{Rainbow('remote add').green} host port
+      Add a new remote node
+    #{Rainbow('remote remove').green} host port
+      Remove the remote node
+    #{Rainbow('remote update').green}
+      Check each registered remote node for availability
+Available options:"
+        o.bool '--help', 'Print instructions'
+      end
       command = args[0]
       case command
       when 'show'
@@ -75,21 +93,7 @@ module Zold
           @log.debug("There are #{total} known remotes")
         end
       else
-        @log.info(
-          "Available commands:
-    #{Rainbow('remote show').green}
-      Show all registered remote nodes
-    #{Rainbow('remote clean').green}
-      Remove all registered remote nodes
-    #{Rainbow('remote reset').green}
-      Restore it back to the default list of nodes
-    #{Rainbow('remote add').green} host port
-      Add a new remote node
-    #{Rainbow('remote remove').green} host port
-      Remove the remote node
-    #{Rainbow('remote update').green}
-      Check each registered remote node for availability"
-        )
+        @log.info(opts.to_s)
       end
     end
 
@@ -123,7 +127,7 @@ module Zold
         @remotes.rescore(r[:host], r[:port], score.value)
         json['all'].each do |s|
           unless @remotes.exists?(s['host'], s['port'])
-            run(['add', s['host'], s['port']])
+            run(['add', s['host'], s['port'].to_s])
           end
         end
         @log.info("#{r[:host]}:#{r[:port]}: #{Rainbow(score.value).green} \

data/lib/zold/node/front.rb

@@ -115,7 +115,7 @@ module Zold
       wallet = wallets.find(id)
       request.body.rewind
       cps = copies(id)
-      cps.add(request.body.read, 'remote', 80, 0)
+      cps.add(request.body.read, 'remote', Remotes::PORT, 0)
       Zold::Merge.new(wallet: wallet, copies: cps).run
       "Success, #{wallet.id} balance is #{wallet.balance}"
     end

data/lib/zold/remotes.rb

@@ -29,6 +29,8 @@ require 'fileutils'
 module Zold
   # All remotes
   class Remotes
+    PORT = 4096
+
     def initialize(file)
       @file = file
     end
@@ -53,24 +55,24 @@ module Zold
       )
     end
 
-    def exists?(host, port = 80)
+    def exists?(host, port = Remotes::PORT)
       !load.find { |r| r[:host] == host && r[:port] == port }.nil?
     end
 
-    def add(host, port = 80)
+    def add(host, port = Remotes::PORT)
       list = load
       list << { host: host, port: port, score: 0 }
       list.uniq! { |r| "#{r[:host]}:#{r[:port]}" }
       save(list)
     end
 
-    def remove(host, port = 80)
+    def remove(host, port = Remotes::PORT)
       list = load
       list.reject! { |r| r[:host] == host && r[:port] == port }
       save(list)
     end
 
-    def score(host, port = 80)
+    def score(host, port = Remotes::PORT)
       load.find { |r| r[:host] == host && r[:port] == port }[:score]
     end
 

data/lib/zold/score.rb

@@ -20,6 +20,7 @@
 
 require 'digest'
 require 'time'
+require_relative 'remotes'
 
 # The score.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -41,7 +42,7 @@ module Zold
       @strength = strength
     end
 
-    ZERO = Score.new(Time.now, 'localhost', 80)
+    ZERO = Score.new(Time.now, 'localhost', Remotes::PORT)
 
     def self.parse(text, strength: DEFAULT_STRENGTH)
       _, time, host, port, suffixes = text.split(' ', 5)

data/lib/zold/version.rb

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

data/test/commands/test_fetch.rb

@@ -57,7 +57,27 @@ class TestFetch < Minitest::Test
       )
       remotes.add('fake-1', 80)
       remotes.add('fake-2', 80)
-      Zold::Fetch.new(wallet: wallet, copies: copies, remotes: remotes).run
+      Zold::Fetch.new(id: id, copies: copies, remotes: remotes).run
+      assert_equal(copies.all[0][:name], '1')
+      assert_equal(copies.all[0][:score], 0)
+    end
+  end
+
+  def test_fetches_empty_wallet
+    Dir.mktmpdir 'test' do |dir|
+      id = Zold::Id.new
+      copies = Zold::Copies.new(File.join(dir, 'copies'))
+      remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
+      remotes.clean
+      stub_request(:get, "http://fake-1/wallet/#{id}").to_return(
+        status: 200,
+        body: {
+          'score': Zold::Score::ZERO.to_h,
+          'body': 'the body'
+        }.to_json
+      )
+      remotes.add('fake-1', 80)
+      Zold::Fetch.new(id: id, copies: copies, remotes: remotes).run
       assert_equal(copies.all[0][:name], '1')
       assert_equal(copies.all[0][:score], 0)
     end

data/test/commands/test_merge.rb

@@ -59,4 +59,30 @@ class TestMerge < Minitest::Test
       Zold::Merge.new(wallet: wallet, copies: copies).run
     end
   end
+
+  def test_merges_into_empty_wallet
+    Dir.mktmpdir 'test' do |dir|
+      id = Zold::Id.new
+      file = File.join(dir, id.to_s)
+      wallet = Zold::Wallet.new(file)
+      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+      first = Zold::Wallet.new(File.join(dir, 'copy-1'))
+      File.write(first.path, File.read(wallet.path))
+      second = Zold::Wallet.new(File.join(dir, 'copy-2'))
+      File.write(second.path, File.read(wallet.path))
+      Zold::Pay.new(
+        payer: first,
+        receiver: second,
+        amount: Zold::Amount.new(zld: 14.95),
+        pvtkey: Zold::Key.new(file: 'fixtures/id_rsa')
+      ).run(['--force'])
+      copies = Zold::Copies.new(File.join(dir, 'copies'))
+      copies.add(File.read(first.path), 'host-1', 80, 5)
+      copies.add(File.read(second.path), 'host-2', 80, 5)
+      Zold::Merge.new(
+        wallet: Zold::Wallet.new(File.join(dir, Zold::Id.new.to_s)),
+        copies: copies
+      ).run
+    end
+  end
 end

data/test/test_remotes.rb

@@ -66,7 +66,7 @@ class TestRemotes < Minitest::Test
       remotes = Zold::Remotes.new(file)
       remotes.add('127.0.0.1', 80)
       remotes.rescore('127.0.0.1', 80, 15)
-      assert_equal(remotes.score('127.0.0.1'), 15)
+      assert_equal(remotes.score('127.0.0.1', 80), 15)
     end
   end
 end

metadata

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