zold 0.13.5 → 0.13.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/zold/commands/node.rb +1 -1
- data/lib/zold/commands/routines/reconnect.rb +4 -2
- data/lib/zold/metronome.rb +1 -1
- data/lib/zold/version.rb +1 -1
- data/test/node/test_front.rb +14 -0
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6ab0a25271ef54c508955c6fe0c19eb94a508176
|
4
|
+
data.tar.gz: ae39bd9676c08e16f729753aa6b02da800559108
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: '0871be3a15bde36de5752167d788b8678ab9769cba1769bda9ec427e1f525d0bdb81c18c128c0d607ee3ee577f79060fa9718c5ea392fe207cb1b9c8d7c2ecab'
|
7
|
+
data.tar.gz: 1fd3ccdb5bafec62fc77d5a5aba0ef0fef12cf967e08ea7f83f29dcea2507b1b949188d3a9d3893a6416b49822fc3947a9cb4a3756d1c17c63b82898b8f7a216
|
data/lib/zold/commands/node.rb
CHANGED
@@ -217,7 +217,7 @@ module Zold
|
|
217
217
|
metronome = Metronome.new(@log)
|
218
218
|
unless opts[:standalone]
|
219
219
|
require_relative 'routines/reconnect'
|
220
|
-
metronome.add(Routines::Reconnect.new(opts, @remotes, log: @log))
|
220
|
+
metronome.add(Routines::Reconnect.new(opts, @remotes, farm, log: @log))
|
221
221
|
end
|
222
222
|
if opts['bonus-wallet']
|
223
223
|
require_relative 'routines/bonuses'
|
@@ -19,6 +19,7 @@
|
|
19
19
|
# SOFTWARE.
|
20
20
|
|
21
21
|
require_relative '../remote'
|
22
|
+
require_relative '../../node/farm'
|
22
23
|
|
23
24
|
# Reconnect routine.
|
24
25
|
# Author:: Yegor Bugayenko (yegor256@gmail.com)
|
@@ -29,9 +30,10 @@ module Zold
|
|
29
30
|
module Routines
|
30
31
|
# Reconnect to the network
|
31
32
|
class Reconnect
|
32
|
-
def initialize(opts, remotes, log: Log::Quiet.new)
|
33
|
+
def initialize(opts, remotes, farm = Farm::Empty.new, log: Log::Quiet.new)
|
33
34
|
@opts = opts
|
34
35
|
@remotes = remotes
|
36
|
+
@farm = farm
|
35
37
|
@log = log
|
36
38
|
end
|
37
39
|
|
@@ -41,7 +43,7 @@ module Zold
|
|
41
43
|
Remote.new(remotes: @remotes, log: @log).run(%w[remote add b1.zold.io 80 --force])
|
42
44
|
end
|
43
45
|
Remote.new(remotes: @remotes, log: @log).run(%w[remote trim])
|
44
|
-
Remote.new(remotes: @remotes, log: @log).run(
|
46
|
+
Remote.new(remotes: @remotes, farm: @farm, log: @log).run(
|
45
47
|
%w[remote update] + (@opts['never-reboot'] ? [] : ['--reboot'])
|
46
48
|
)
|
47
49
|
end
|
data/lib/zold/metronome.rb
CHANGED
@@ -43,7 +43,7 @@ module Zold
|
|
43
43
|
routine.exec(step)
|
44
44
|
sleep(1)
|
45
45
|
step += 1
|
46
|
-
@log.debug("Routine #{routine.class.name} ##{step} done in #{((Time.now - start) / 60).round(2)}s
|
46
|
+
@log.debug("Routine #{routine.class.name} ##{step} done in #{((Time.now - start) / 60).round(2)}s")
|
47
47
|
end
|
48
48
|
end
|
49
49
|
end
|
data/lib/zold/version.rb
CHANGED
data/test/node/test_front.rb
CHANGED
@@ -20,6 +20,7 @@
|
|
20
20
|
|
21
21
|
require 'minitest/autorun'
|
22
22
|
require 'json'
|
23
|
+
require 'time'
|
23
24
|
require_relative '../test__helper'
|
24
25
|
require_relative 'fake_node'
|
25
26
|
require_relative '../fake_home'
|
@@ -54,6 +55,19 @@ class FrontTest < Minitest::Test
|
|
54
55
|
end
|
55
56
|
end
|
56
57
|
|
58
|
+
def test_updates_list_of_remotes
|
59
|
+
FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
|
60
|
+
score = Zold::Score.new(
|
61
|
+
Time.now, 'a.example.com',
|
62
|
+
999, 'NOPREFIX@ffffffffffffffff',
|
63
|
+
strength: 1
|
64
|
+
).next.next.next.next
|
65
|
+
response = Zold::Http.new("http://localhost:#{port}/remotes", score).get
|
66
|
+
body = response.body
|
67
|
+
assert_equal(1, JSON.parse(body)['all'].count, body)
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
57
71
|
def test_renders_wallet_pages
|
58
72
|
FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
|
59
73
|
FakeHome.new.run do |home|
|