fixtures/scripts/push-and-pull.sh in zold-0.18.8 vs fixtures/scripts/push-and-pull.sh in zold-0.18.9

- old
+ new

@@ -2,11 +2,11 @@ port=$(reserve_port) mkdir server cd server -zold node --trace --invoice=PUSHNPULL@ffffffffffffffff \ +zold node --trace --invoice=PUSHNPULL@ffffffffffffffff --tolerate-edges \ --host=127.0.0.1 --port=${port} --bind-port=${port} \ --threads=0 --standalone 2>&1 & pid=$! trap "halt_nodes ${port}" EXIT cd .. @@ -27,16 +27,16 @@ zold show zold show 0000000000000000 zold taxes debt 0000000000000000 zold remote show -zold push -zold push 0000000000000000 -until zold fetch 0000000000000000 --ignore-score-weakness; do +zold push --tolerate-edges +zold push 0000000000000000 --tolerate-edges +until zold fetch 0000000000000000 --ignore-score-weakness --tolerate-edges; do echo 'Failed to fetch, let us try again' sleep 1 done -zold fetch +zold fetch --tolerate-edges zold diff 0000000000000000 zold merge zold merge 0000000000000000 zold clean zold clean 0000000000000000