zold 0.13.43 → 0.13.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c1b984c84978412b1cbbc753771396705f0d544
-  data.tar.gz: 653f5e746fbae90ab0609915452eb646e49d86d9
+  metadata.gz: bf5190e58996ff52177172576009917026da5136
+  data.tar.gz: 7f0ce81b3a4ae8b21eb835cd6eb2d0e6aecd2aee
 SHA512:
-  metadata.gz: 7aa48a078b7b037d165eae145f995ce886fb62f3bfe7d0f8b3e6fac984c80b02c6d4c0c5afc51f0c7411d9de28f6e0a607818043bd6c66f8fff4a38b82690784
-  data.tar.gz: 31e5789f3c7bc710b3ee970376c40c140f0d73251ebd0a182e5acf7185ea4e9b0ed94f82b753722d8ca5824fd68274d997d26fe4e7d9038324181d6ffd65b65a
+  metadata.gz: a8e5c2b7ed530521fc5d3f8bda21b3f547a3a8757e3e4fa083be4b1cbf3cb59e793514d8ea85feb3f4a195e0e398312956bc7b7fa5b0c0f1587250d61a278bfd
+  data.tar.gz: a64b280273fcfae4bccf039b01419450065757cc8d3de53e88435864f3f026b6c2f49778c2d5b9dbe3565172681906a893fc4c3adfb04b3eee77675daef0a276

data/README.md

@@ -18,7 +18,7 @@
 **NOTICE**: It's an experiment and a very early draft! Please, feel free to
 submit your ideas and/or pull requests.
 
-Here is the [White Paper](https://github.com/zold-io/papers/raw/master/wp.pdf).
+Here is the [White Paper](https://papers.zold.io/wp.pdf).
 
 Join our [Telegram group](https://t.me/zold_io) to discuss it all live.
 

data/fixtures/merge/asserts.rb

@@ -0,0 +1,34 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest'
+
+# Test only module
+module Assertions
+  extend Minitest::Assertions
+  class << self
+    attr_accessor :assertions
+  end
+  self.assertions = 0
+end
+
+def assert_equal(a, b)
+  Assertions.assert_equal(a, b)
+end

data/fixtures/merge/id_rsa

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

data/fixtures/merge/id_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCemmeTOsKt6IpocXT1cpLps77bbvj7BIaj4Xwoe9Ws1up5qv97T2v08H8/psV0ugyHhdzun/v41IRkt67YSD90GRAsRvwz/OCRPiAEMbIRNb/O6xgcjOdf+WB/R/yqV4hAggH/djtCkPO2RqZZhMpaWeaWtxC8JUHS5FE+bhkxwwmi4pH2fsTYOkv16iUrI7Cv8ljTyIk64rce5bq1F28T7THsj7AOmszrk4f8+gCuV87mqcgZt5fCwQZFe3TDpr+5s+l5p0WM9ei0TtxPVIDhhIPW1ZMhWbVlamk4T3rtegMi6bq3O3kp/MM1F+z0ZsJ87QEvbfkfFs7wj2tOVUtMpw0CIR7QJaiVj0dHmkxqiw6Bno8HngickRkmzgvZvXRz4iVVRfVFKfB8ViDS/LmiqtjKq3uCeKmX/Tphbg8ohhztOWOiCwQd/0LP+SkQrOoO2wfYuuaMw2xtaKi6y80cz4w+By4yDxmfAsrAPL01Z0jhctOmDqFVEk0f16tl18A7m2D/e5vckt4lvI2jgF3l/8Gevlg3/1qFnzuRKkju/RCT3h1HiEM+Oy0RyCHJn1FVSg3nb6HWDzdx3dwiqSwl3SSJ8wKgGY5sPTXdFI9Co3Cv0YZTYlokSbblWrfl3LYMcCQ5ClRlVPwY2D0gzipQNXTJqBM3dtnK+4tYiC59vQ== yegor@be.Dlink

data/fixtures/merge/random-expenses/0000000000000000

@@ -0,0 +1,6 @@
+test
+1
+0000000000000000
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0001;2018-06-22T07:38:23Z;fffffe0000000000;g6hVRJNH;0123456789abcdef;To help you;IFQvo0PN3JkpkuZRjPyQ6BywuM9aSRFI6GdNOevSQxWJMwSesYp6b25KIi78TcIV9b84f0Qr96d8TgvkTjLqczvZZzyYIJ+e2w8qQhbxSiCgFxfThm6U8NnrXNprMBRHg4amV40dAjgW2lfVDDRk+RtCYEUEZDX5xPhiCHC8lhtoJm/atgJfgOIAfeLTy6ZWwC+teMtHUt6/uHH9z9giYnWHLBpYFyjYSSlrf4K/0e86Kzy/8Bwmk9Q/I6Yvo7IWL7TNN5vCGiz74R2wUTHVfmlY/YdXD15JnPmmZGjoR+BCjxbpjPqYWGm2bTxSuDHCFg0oTKAHIPqC57hKzGQUNzmoSqMHxTBDTvdLHjf0Uo9oaWhdT+BTpnGzFJxgz7d9oJOsIFqrLzPZ6VjOqKtl+ptbFkrjpq9ZdfpbzzBxHhLU8quxmBihodxBZAI6f2rpDGgnwS/D2v+Ncdcmqpdin1GkU0lAeAzWhenKBqu2t9C5UeZbjw6diiKyrGPHWLS9X9BGX9j6STMyI93f81Y6+j798gqv+XZtsohxL/sHDNJK0m81S6QWnAD//bZbNqW85y8ZMFwHmn3GXsSDupaQGpe6wpvFknWxho4vM8A/nAk20rWur5PF1S4RpFwpOr/4RmBA06yWnPxdB6x9lonPKmYC5Pck0fwxXDOEcjMTdWo=

data/fixtures/merge/random-expenses/0123456789abcdef

@@ -0,0 +1,6 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000000;To help you;

data/fixtures/merge/random-expenses/assert.rb

@@ -0,0 +1,23 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative 'asserts.rb'
+wallet = Zold::Wallet.new(Zold::Id.new('0123456789abcdef'))
+assert_equal(Zold::Amount.new(zld: 388.0), wallet.balance)

data/fixtures/merge/random-expenses/copies/0123456789abcdef/1

@@ -0,0 +1,7 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0001;2018-06-22T08:26:19Z;fffffff000000000;TESTPREFIX;ffffffffffffffff;For pizza;L1MFiKqM8O6Eg/v54TD7M48gI/oq7iYYmjM7cKgUpMUk7dx48K+9DRQ2as+d2SrMMH/TKdJ/It8v8DJN6RV3kVtpdZo7CsUrUisive5rpJduO68+nJFr3TB3vQrCPm8N3Cz9vfmM68WrmskPHOABETyIC9cSQrSIvaCWhchwru7sO0625y2aYiMVoW2jmKFTtflGr6M9n7rqTkaYG/EftrNMrJS7PaG19T1HOQupAcKQ4DzBujEnbm3KQQc9Rp5GR8cb49Y38IAr9lENkDB1zmMaVJeZNEyX0ne6S1ZB7Ys9L0jUIJA+SRzNHDEdWC6lcOifcCuanU4kBPFtOiuAjghJX09l8Ue1pyE478+Sy8BgApqKu1l4+p+qUSXOTx7yKwT9ahZaA9DgVHEinz6MqhiozDddw24fXRK956pQ+jUPzNJXVeH4UrDcUDAaCIX8jCaaqGQUqhJXH2KF0Z1PtWBfHYB7OxXEpiVVtScMQ+68iB40p71f7j4YrVW50G89NrCJbOamdai+3dmwiIZzSOsSahB8kXrkaF+lrDZiwNPfL2ixs3F2xW34aKHvA/UCCo7PVfUVDLC8VHiDtAKTSyoqhPP4ocomszfRaRGxSjDIh3ceCrPH9BIW2zfUzkU63+dJ5adS+XSXzO3L3gfwiLM6XPr2jlJbPy1OSMkDK7s=
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000000;To help you;

data/fixtures/merge/random-expenses/copies/0123456789abcdef/2

@@ -0,0 +1,7 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0002;2018-06-22T08:26:36Z;ffffffe000000000;TESTPREFIX;eeeeeeeeeeeeeeee;For coffee;ctLF7pKtNHLoaVmsSdPTjfilp0GIdP4EVCCnQs39j6AIAYJtr0342rfMmql8piCrPn/TbnrL835QwohFHolH44ygTRgcQ2ZCSVvK49M+FekPg25S38jZEGQvBiIEdw4y/DyOW7pQLCubIqZZdbuUHuR4S5InI+sFm+IlMaKPaJ3NoOo6dgX+XC+cxJqhM8e8L/Sy2s3smNvPKjy3FVh5vEeharoov6frQztLABwFIJIGMGI6xDCfZO0lh6X3FjCCwtrtMK0pY2cYHNZS3GzMtvpQE0sNPIAjujjI/Sz8bTOLqaRSD+8SjR24DRDq4nD90L74NbbxwFaypFyhVIryAzetZs+AIhkf7hDVnh3GtzfoqIQKOzQPFV6oV4ciFSR5oiT6yt89xxeKhHTKD/E1nw0xltZ+SiqVH9Ha/8NEn5wJEeko5h+fnDL+1yVziQy9gMC1Dh/pnZgMn8T7k2Ecif3knxZf+NAoCvFRyueFzZM7S7xDs9krxc56EnZaLo7/pJ6jVuXLQlXnMgzPrbx8mJSjUQY6X2yNe5qVFauSwH6JAa0ewZm5H8n0dsHT0bKHxV+eRcFFh/g3z6LEwxxCN6KrLnPr3x66NntCEom3B+y6WCPnpa9gKSHu1caLuSoSbJ1R8Rtx1iqQN3iHlVIbHpiy3xTbfXKiwS17KZV46yA=
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000000;To help you;

data/fixtures/merge/random-expenses/copies/0123456789abcdef/3

@@ -0,0 +1,7 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0003;2018-06-22T08:26:54Z;fffffff800000000;TESTPREFIX;eeeeeeeeeeeeeeee;For fun;TMrg2FZY8HJHTq7FM0VAMSTzMd3WFpUtI0naaR58pEpC/kSXM820bwIkErFW6Ymie03baRoB7BHnqrJjhCN57KkrK0LUr+FMQNbkPfbhqWnws0X/+HIcSTEdWozkc/t/I4xD2dGHUqbjJRPU87KfbmadVLwZx9TO5bL0ywBGZbV8di+GgQ7/NDdmyIWE/bkW/t3rErfNEYu0X3pyj41T02MwgETNyZTvfzhZWXFD2fooJ3qFIdw8kLoNY2RJkCwpxeJMAyeFvEWi9D5LoSO2VWw7okZylkA4TiwfDByPip9ABu4ekR7lq1MIL1RxswwwwQLiBi0VrvV3tN4VXTpaBYQTjuEh7mC3IwuK84Q29o1QX8sVcihnrwYDuUohx7D3HdSTxoV8EFsWmAaSHMwQn9xhb4hAkbS5Zv9qUvsjjBcdf9jhFTo/ecT17pdav5fZ+lxx7+fYVklJK/J9z7ZXKphOfbQ3Jg5oeOO4kuAcpSRjd2SAHySzsf06xfa5L32ZDcLorqVZC5GUdikHHVc889HeZbWNkPbGbCleK2ICwGh5b+eW1KAygtXrehhJiJVJfCPlxpFk172DdZf9Rxfs5QKdH4QTIt3xztAdU6BwZ7nwpejyz7hbgou1XqqCcaZEkMD3vMOBGurBfKFpCgX+YYsxMphmw9QSNi1D/WnSkvE=
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000000;To help you;

data/fixtures/merge/random-expenses/copies/0123456789abcdef/4

@@ -0,0 +1,7 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0004;2018-06-22T08:27:06Z;ffffffc000000000;TESTPREFIX;eeeeeeeeeeeeeeee;For something else;K0V9Hfv9vAhe2QlCq69RI55bAI0RFHTaDrZFaY9pGiQT6vQV5cri19XhI6BC2i9qWUqIhEL2ikaPGZ5ODqu4rt6BBQcb/OOwZU21lPEcdm/n8HCsitPzGDX/hGjWg/ab88mFw5qLB6pasadtvjDoTG/5dBoB5rk9Ujy2c5JPpiXGR8OqF2bUsMVmUXSEKFmAK3u/EgrcApz4kFezcCriZ4lwqjgyT7grbyZXyGu8AA+AhX3zq/tyiuNJbHCrsnuWedxa9DtlTQy0/qg3JT2xPcruxoBe6ijjPbalMwWI41jt5Bp+wNUaFm94kc2cB+gyxQPf7vtHgVv5C9ikMO4XMF9b3PBVCB4i7J6b+U+PCHG4m/EA9c+PZvJSVc2cV+Ya8YTL+yTXiXOGpzvjateDwatyKjE5yA5G8yfxrtPDwuWslhT//kSHFuwpUGwZnTL4q769Wy/lEQM2uLWlD0GJ+mb/PZ6n5YhbGsgUAFiV2h93x1g3u0JKykP8/E758ZGWPMoivdxKm+dhRjNjh8jQ89Kt8UkGsD3vhi4pkSkm6vXQ8q/tq9ul6R3Is8FVAU2V9vThI/GZmT+BMUHsrMnpXEQEoBMQSMMcaSpK4hwRfpYmpC7NKBDUoSQhIcMumsXvDQaJKybKqC1BO1y3t9L7OX0Ev/fJawcDY4sJgptq7JQ=
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000000;To help you;

data/fixtures/merge/random-expenses/copies/0123456789abcdef/5

@@ -0,0 +1,7 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0005;2018-06-22T08:27:22Z;fffffffc00000000;TESTPREFIX;eeeeeeeeeeeeeeee;For my friend;WF/xCNKtRpzm2DPlFAOsxHKCw6hg5Nrn3M78cNSpoaEQRPDCaPeLrQiOkLaseqPB3xk//F74qJv4EcKsjlWsgH+eQ9PQ7pp1+4pnEqff1fXcb6M5vxIa8BMMYfbcPyWIIDtAyHSn/8t35r/Zanua0tcH0FfGLzfUfGK4jK9s49rLPkEDVGjKGJPS0zaJP4a3DWclohGvU1+t2EGNk09niDKhtZKjv6YRk9t11kK76zsWj8Zc9NVxthpGavRgsrGSP7jPsMsLdPYnEGXberO1Iexl5FHG/Gc8+kj/qUcGZv3f06vfkbGbAgknibufv8uAD1OVcptjp+M55HcWyFXJhvI2OIDoyQv1RIUiL26X0b3qAOEqKEXnnAA5FbD7RlanJ3Jl+IzDKYrocE5mWvrK36w31meTReJH8I1bX8XK4TIHJNXh8xi2LK1fUZ8Crxg8pPxLgvrgfk8AR9sOS+vC5tmbWsuP1EDSwD6wB9TYGbacgpSd3Yzz8DEOvNykJoEpEUku4MLeJzYQPC7n1GWoO7ysFDr+BXiFd7d+xdfUnDK8UiiT2AecUpnnNr4fjuWfa5OTbcYmKQ34Ys3ddNc47Vc9+Eax8Q1qnEZs5lMiyA7r7gkPQSKMP17L9NyYPMOwzLvspmUzgK8vDylTHW3uGNb86dzyqKkXeA+fs7AmjTs=
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000000;To help you;

data/fixtures/merge/random-expenses/copies/0123456789abcdef/scores

@@ -0,0 +1,5 @@
+1,0.0.0.0,4096,10,2018-06-21T03:41:21Z
+2,0.0.0.0,4096,20,2018-06-21T03:41:21Z
+3,0.0.0.0,4096,30,2018-06-21T03:41:21Z
+4,0.0.0.0,4096,40,2018-06-21T03:41:21Z
+5,0.0.0.0,4096,50,2018-06-21T03:41:21Z

data/fixtures/merge/simple-case/0000000000000000

@@ -0,0 +1,6 @@
+test
+1
+0000000000000000
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0001;2018-06-22T07:38:23Z;fffffe0000000000;g6hVRJNH;0123456789abcdef;To help you;IFQvo0PN3JkpkuZRjPyQ6BywuM9aSRFI6GdNOevSQxWJMwSesYp6b25KIi78TcIV9b84f0Qr96d8TgvkTjLqczvZZzyYIJ+e2w8qQhbxSiCgFxfThm6U8NnrXNprMBRHg4amV40dAjgW2lfVDDRk+RtCYEUEZDX5xPhiCHC8lhtoJm/atgJfgOIAfeLTy6ZWwC+teMtHUt6/uHH9z9giYnWHLBpYFyjYSSlrf4K/0e86Kzy/8Bwmk9Q/I6Yvo7IWL7TNN5vCGiz74R2wUTHVfmlY/YdXD15JnPmmZGjoR+BCjxbpjPqYWGm2bTxSuDHCFg0oTKAHIPqC57hKzGQUNzmoSqMHxTBDTvdLHjf0Uo9oaWhdT+BTpnGzFJxgz7d9oJOsIFqrLzPZ6VjOqKtl+ptbFkrjpq9ZdfpbzzBxHhLU8quxmBihodxBZAI6f2rpDGgnwS/D2v+Ncdcmqpdin1GkU0lAeAzWhenKBqu2t9C5UeZbjw6diiKyrGPHWLS9X9BGX9j6STMyI93f81Y6+j798gqv+XZtsohxL/sHDNJK0m81S6QWnAD//bZbNqW85y8ZMFwHmn3GXsSDupaQGpe6wpvFknWxho4vM8A/nAk20rWur5PF1S4RpFwpOr/4RmBA06yWnPxdB6x9lonPKmYC5Pck0fwxXDOEcjMTdWo=

data/fixtures/merge/simple-case/0123456789abcdef

@@ -0,0 +1,5 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+

data/fixtures/merge/simple-case/assert.rb

@@ -0,0 +1,23 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative 'asserts'
+wallet = Zold::Wallet.new(Zold::Id.new('0123456789abcdef'))
+assert_equal(Zold::Amount.new(zld: 512.0), wallet.balance)

data/fixtures/merge/simple-case/copies/0123456789abcdef/1

@@ -0,0 +1,6 @@
+test
+1
+0123456789abcdef
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnppnkzrCreiKaHF09XKS6bO+2274+wSGo+F8KHvVrNbqear/e09r9PB/P6bFdLoMh4Xc7p/7+NSEZLeu2Eg/dBkQLEb8M/zgkT4gBDGyETW/zusYHIznX/lgf0f8qleIQIIB/3Y7QpDztkamWYTKWlnmlrcQvCVB0uRRPm4ZMcMJouKR9n7E2DpL9eolKyOwr/JY08iJOuK3HuW6tRdvE+0x7I+wDprM65OH/PoArlfO5qnIGbeXwsEGRXt0w6a/ubPpeadFjPXotE7cT1SA4YSD1tWTIVm1ZWppOE967XoDIum6tzt5KfzDNRfs9GbCfO0BL235HxbO8I9rTlVLTKcNAiEe0CWolY9HR5pMaosOgZ6PB54InJEZJs4L2b10c+IlVUX1RSnwfFYg0vy5oqrYyqt7gnipl/06YW4PKIYc7TljogsEHf9Cz/kpEKzqDtsH2LrmjMNsbWiousvNHM+MPgcuMg8ZnwLKwDy9NWdI4XLTpg6hVRJNH9erZdfAO5tg/3ub3JLeJbyNo4Bd5f/Bnr5YN/9ahZ87kSpI7v0Qk94dR4hDPjstEcghyZ9RVUoN52+h1g83cd3cIqksJd0kifMCoBmObD013RSPQqNwr9GGU2JaJEm25Vq35dy2DHAkOQpUZVT8GNg9IM4qUDV0yagTN3bZyvuLWIgufb0CAwEAAQ==
+
+0001;2018-06-22T07:38:23Z;0000020000000000;g6hVRJNH;0000000000000000;To help you;

data/fixtures/merge/simple-case/copies/0123456789abcdef/scores

@@ -0,0 +1 @@
+1,0.0.0.0,4096,50,2018-06-21T03:41:21Z

data/lib/zold/commands/clean.rb

@@ -51,13 +51,13 @@ Available options:"
       mine = Args.new(opts, @log).take || return
       mine = @wallets.all if mine.empty?
       mine.map { |i| Id.new(i) }.each do |id|
-        clean(Copies.new(File.join(@copies, id)), opts)
+        clean(Copies.new(File.join(@copies, id), log: @log), opts)
       end
     end
 
     def clean(cps, _)
-      cps.clean
-      @log.debug("Expired local copies removed for #{cps}, \
+      deleted = cps.clean
+      @log.debug("#{deleted} expired local copies removed for #{cps}, \
 #{cps.all.count} left")
     end
   end

data/lib/zold/commands/merge.rb

@@ -72,8 +72,8 @@ Available options:"
       cps = cps.all.sort_by { |c| c[:score] }.reverse
       patch = Patch.new(@wallets, log: @log)
       cps.each do |c|
-        merge_one(opts, patch, Wallet.new(c[:path]), "#{c[:host]}:#{c[:port]}")
-        @log.debug("#{c[:host]}:#{c[:port]} merged: #{patch}")
+        merge_one(opts, patch, Wallet.new(c[:path]), c[:name])
+        @log.debug("Copy ##{c[:name]} merged: #{patch}")
       end
       wallet = @wallets.find(id)
       if wallet.exists?
@@ -84,7 +84,7 @@ Available options:"
       end
       modified = patch.save(wallet.path, overwrite: true)
       if modified
-        @log.debug("#{cps.count} copies merged successfully into #{wallet.path}")
+        @log.debug("#{cps.count} copies merged successfully into #{wallet.id}, balance is #{wallet.balance}")
       else
         @log.debug("Nothing changed in #{wallet.id} after merge of #{cps.count} copies")
       end
@@ -94,7 +94,7 @@ Available options:"
     def merge_one(opts, patch, wallet, name)
       patch.join(wallet, !opts['no-baseline'])
     rescue StandardError => e
-      @log.error("Can't merge a copy coming from #{name}: #{e.message}")
+      @log.error("Can't merge copy ##{name}: #{e.message}")
       @log.debug(Backtrace.new(e).to_s)
     end
   end

data/lib/zold/commands/pull.rb

@@ -38,9 +38,9 @@ module Zold
     end
 
     def run(args = [])
+      Zold::Clean.new(wallets: @wallets, copies: @copies, log: @log).run(args)
       Zold::Fetch.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(args)
       Zold::Merge.new(wallets: @wallets, copies: @copies, log: @log).run(args)
-      Zold::Clean.new(wallets: @wallets, copies: @copies, log: @log).run(args)
     end
   end
 end

data/lib/zold/copies.rb

@@ -21,6 +21,7 @@
 require 'time'
 require 'csv'
 require_relative 'atomic_file'
+require_relative 'log'
 
 # The list of copies.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -29,8 +30,12 @@ require_relative 'atomic_file'
 module Zold
   # All copies
   class Copies
-    def initialize(dir)
+    def initialize(dir, log: Log::Quiet.new)
+      raise 'Dir can\'t be nil' if dir.nil?
       @dir = dir
+      raise 'Log can\'t be nil' if log.nil?
+      @log = log
+      @mutex = Mutex.new
     end
 
     def root
@@ -42,16 +47,27 @@ module Zold
     end
 
     def clean
-      list = load
-      list.reject! { |s| s[:time] < Time.now - 24 * 60 * 60 }
-      save(list)
-      Dir.new(@dir).select { |f| f =~ /^[0-9]+$/ }.each do |f|
-        File.delete(File.join(@dir, f)) if list.find { |s| s[:name] == f }.nil?
+      @mutex.synchronize do
+        list = load
+        list.reject! { |s| s[:time] < Time.now - 24 * 60 * 60 }
+        save(list)
+        deleted = 0
+        Dir.new(@dir).select { |f| f =~ /^[0-9]+$/ }.each do |f|
+          next unless list.find { |s| s[:name] == f }.nil?
+          file = File.join(@dir, f)
+          size = File.size(file)
+          File.delete(file)
+          @log.debug("Copy ##{f} deleted: #{size}b")
+          deleted += 1
+        end
+        deleted
       end
     end
 
     def remove(host, port)
-      save(load.reject { |s| s[:host] == host && s[:port] == port })
+      @mutex.synchronize do
+        save(load.reject { |s| s[:host] == host && s[:port] == port })
+      end
     end
 
     # Returns the name of the copy
@@ -63,47 +79,49 @@ module Zold
       raise "Time must be in the past: #{time}" if time > Time.now
       raise 'Score must be Integer' unless score.is_a?(Integer)
       raise "Score can't be negative: #{score}" if score < 0
-      FileUtils.mkdir_p(@dir)
-      list = load
-      target = list.find do |s|
-        f = File.join(@dir, s[:name])
-        File.exist?(f) && AtomicFile.new(f).read == content
-      end
-      if target.nil?
-        max = Dir.new(@dir)
-          .select { |f| f =~ /^[0-9]+$/ }
-          .map(&:to_i)
-          .max
-        max = 0 if max.nil?
-        name = (max + 1).to_s
-        AtomicFile.new(File.join(@dir, name)).write(content)
-      else
-        name = target[:name]
+      @mutex.synchronize do
+        FileUtils.mkdir_p(@dir)
+        list = load
+        target = list.find do |s|
+          f = File.join(@dir, s[:name])
+          File.exist?(f) && AtomicFile.new(f).read == content
+        end
+        if target.nil?
+          max = Dir.new(@dir)
+            .select { |f| f =~ /^[0-9]+$/ }
+            .map(&:to_i)
+            .max
+          max = 0 if max.nil?
+          name = (max + 1).to_s
+          AtomicFile.new(File.join(@dir, name)).write(content)
+        else
+          name = target[:name]
+        end
+        list.reject! { |s| s[:host] == host && s[:port] == port }
+        list << {
+          name: name,
+          host: host,
+          port: port,
+          score: score,
+          time: time
+        }
+        save(list)
+        name
       end
-      list.reject! { |s| s[:host] == host && s[:port] == port }
-      list << {
-        name: name,
-        host: host,
-        port: port,
-        score: score,
-        time: time
-      }
-      save(list)
-      name
     end
 
     def all
-      load.group_by { |s| s[:name] }.map do |name, scores|
-        {
-          name: name,
-          host: scores[0][:host],
-          port: scores[0][:port],
-          path: File.join(@dir, name),
-          score: scores.select { |s| s[:time] > Time.now - 24 * 60 * 60 }
-            .map { |s| s[:score] }
-            .inject(&:+) || 0
-        }
-      end.select { |c| File.exist?(c[:path]) }
+      @mutex.synchronize do
+        load.group_by { |s| s[:name] }.map do |name, scores|
+          {
+            name: name,
+            path: File.join(@dir, name),
+            score: scores.select { |s| s[:time] > Time.now - 24 * 60 * 60 }
+              .map { |s| s[:score] }
+              .inject(&:+) || 0
+          }
+        end.select { |c| File.exist?(c[:path]) }
+      end
     end
 
     private

data/lib/zold/node/entrance.rb

@@ -48,6 +48,8 @@ module Zold
       @address = address
       raise 'Log can\'t be nil' if log.nil?
       @log = log
+      @history = []
+      @mutex = Mutex.new
     end
 
     def start
@@ -55,7 +57,9 @@ module Zold
     end
 
     def to_json
-      {}
+      {
+        history: @history.join(', ')
+      }
     end
 
     # Returns a list of modifed wallets (as Zold::Id)
@@ -77,9 +81,15 @@ module Zold
       ).run(['merge', id.to_s, '--no-baseline'])
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove(localhost, Remotes::PORT)
-      unless modified.empty?
-        @log.info("Accepted #{id} in #{(Time.now - start).round(2)}s \
-and modified #{modified.join(', ')}")
+      sec = (Time.now - start).round(2)
+      if modified.empty?
+        @log.info("Accepted #{id} in #{sec}s and not modified anything")
+      else
+        @log.info("Accepted #{id} in #{sec}s and modified #{modified.join(', ')}")
+      end
+      @mutex.synchronize do
+        @history.shift if @history.length > 16
+        @history << "#{id}/#{sec}/#{modified.count}"
       end
       modified
     end

data/lib/zold/patch.rb

@@ -40,7 +40,7 @@ module Zold
     end
 
     def to_s
-      return 'empty' if @txns.empty?
+      return 'empty patch' if @txns.empty?
       "#{@txns.count} txns"
     end
 
@@ -61,14 +61,9 @@ module Zold
       end
       raise 'Public key mismatch' if wallet.key != @key
       raise "Wallet ID mismatch: #{@id} != #{wallet.id}" if wallet.id != @id
-      max = @txns.select { |t| t.amount.negative? }.map(&:id).max.to_i
       wallet.txns.each do |txn|
         next if @txns.find { |t| t == txn }
         if txn.amount.negative?
-          if txn.id <= max
-            @log.error("Transaction ID is not greater than max ID #{max}: #{txn.to_text}")
-            next
-          end
           dup = @txns.find { |t| t.id == txn.id && t.amount.negative? }
           if dup
             @log.error("An attempt to overwrite #{dup.to_text} with this: #{txn.to_text}")
@@ -100,8 +95,8 @@ among #{payer.txns.count} transactions: #{txn.to_text}")
             next
           end
         end
-        @log.debug("Merged on top: #{txn.to_text}")
         @txns << txn
+        @log.debug("Merged on top, balance is #{@txns.map(&:amount).inject(&:+)}: #{txn.to_text}")
       end
     end
 

data/lib/zold/version.rb

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

data/test/commands/test_merge.rb

@@ -19,6 +19,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'tmpdir'
 require 'time'
 require 'webmock/minitest'
 require_relative '../test__helper'
@@ -121,4 +122,22 @@ class TestMerge < Minitest::Test
       assert_equal(Zold::Amount::ZERO, main.balance)
     end
   end
+
+  def test_merges_scenarios
+    base = 'fixtures/merge'
+    Dir.new(base).select { |f| File.directory?(File.join(base, f)) && !f.start_with?('.') }.each do |f|
+      Dir.mktmpdir 'test' do |dir|
+        FileUtils.cp_r(File.join('fixtures/merge', "#{f}/."), dir)
+        FileUtils.cp('fixtures/merge/asserts.rb', dir)
+        wallets = Zold::Wallets.new(dir)
+        copies = File.join(dir, 'copies')
+        Zold::Merge.new(wallets: wallets, copies: copies, log: test_log).run(
+          %w[merge 0123456789abcdef]
+        )
+        Dir.chdir(dir) do
+          require File.join(dir, 'assert.rb')
+        end
+      end
+    end
+  end
 end

data/test/node/test_entrance.rb

@@ -51,10 +51,18 @@ class TestEntrance < Minitest::Test
     FakeHome.new.run do |home|
       source = home.create_wallet(sid)
       home.create_wallet(tid)
-      modified = Zold::Entrance.new(home.wallets, home.remotes, home.copies(source).root, 'x', log: test_log).push(
-        source.id, body
-      )
+      e = Zold::Entrance.new(home.wallets, home.remotes, home.copies(source).root, 'x', log: test_log)
+      modified = e.push(source.id, body)
       assert_equal(2, modified.count)
     end
   end
+
+  def test_renders_json
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      e = Zold::Entrance.new(home.wallets, home.remotes, home.copies.root, 'x', log: test_log)
+      e.push(wallet.id, File.read(wallet.path))
+      assert(e.to_json[:history].include?(wallet.id.to_s))
+    end
+  end
 end

data/test/node/test_front.rb

@@ -147,7 +147,7 @@ class FrontTest < Minitest::Test
         "Expected HTTP 200 OK: Found #{response.code}"
       )
       assert_operator(
-        700, :>, response['content-length'].to_i,
+        750, :>, response['content-length'].to_i,
         'Expected the content to be smaller than 600 bytes for gzip'
       )
     end

data/test/test_amount.rb

@@ -19,7 +19,6 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'tmpdir'
 require_relative '../lib/zold/amount'
 
 # Amount test.

data/test/test_zold.rb

@@ -31,8 +31,7 @@ require_relative '../lib/zold/version'
 # License:: MIT
 class TestZold < Minitest::Test
   def test_all_scripts
-    Dir.new('fixtures/scripts').each.select { |f| f =~ /\.sh$/ && !f.start_with?('_') }.each do |f|
-      next unless f == 'redeploy-on-upgrade.sh'
+    Dir.new('fixtures/scripts').select { |f| f =~ /\.sh$/ && !f.start_with?('_') }.each do |f|
       Dir.mktmpdir 'test' do |dir|
         FileUtils.cp('fixtures/id_rsa.pub', dir)
         FileUtils.cp('fixtures/id_rsa', dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.13.43
+  version: 0.13.44
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -327,6 +327,23 @@ files:
 - fixtures/keys/1.pub
 - fixtures/keys/2
 - fixtures/keys/2.pub
+- fixtures/merge/asserts.rb
+- fixtures/merge/id_rsa
+- fixtures/merge/id_rsa.pub
+- fixtures/merge/random-expenses/0000000000000000
+- fixtures/merge/random-expenses/0123456789abcdef
+- fixtures/merge/random-expenses/assert.rb
+- fixtures/merge/random-expenses/copies/0123456789abcdef/1
+- fixtures/merge/random-expenses/copies/0123456789abcdef/2
+- fixtures/merge/random-expenses/copies/0123456789abcdef/3
+- fixtures/merge/random-expenses/copies/0123456789abcdef/4
+- fixtures/merge/random-expenses/copies/0123456789abcdef/5
+- fixtures/merge/random-expenses/copies/0123456789abcdef/scores
+- fixtures/merge/simple-case/0000000000000000
+- fixtures/merge/simple-case/0123456789abcdef
+- fixtures/merge/simple-case/assert.rb
+- fixtures/merge/simple-case/copies/0123456789abcdef/1
+- fixtures/merge/simple-case/copies/0123456789abcdef/scores
 - fixtures/scripts/_head.sh
 - fixtures/scripts/calculate-scores.sh
 - fixtures/scripts/print-helps.sh