Merge branch '1.6' into dev

3d6edb1a · Éloïs · 9d1df3f0 · efe8992f · 3d6edb1a · 3d6edb1a
Commit 3d6edb1a authored 7 years ago by Éloïs
--- a/test/fast/merkle.js
+++ b/test/fast/merkle.js
--- a/test/fast/modules/bma/ddos-test.js
+++ b/test/fast/modules/bma/ddos-test.js
--- a/test/fast/modules/bma/limiter-test.js
+++ b/test/fast/modules/bma/limiter-test.js
--- a/test/fast/modules/bma/module-test.js
+++ b/test/fast/modules/bma/module-test.js
--- a/test/fast/modules/common/crypto.js
+++ b/test/fast/modules/common/crypto.js
--- a/test/fast/modules/common/grammar.ts
+++ b/test/fast/modules/common/grammar.ts
--- a/test/fast/modules/common/peering.js
+++ b/test/fast/modules/common/peering.js
--- a/test/fast/modules/common/randomKey.js
+++ b/test/fast/modules/common/randomKey.js
--- a/test/fast/modules/common/tx_format.js
+++ b/test/fast/modules/common/tx_format.js
--- a/test/fast/modules/crawler/block_pulling.ts
+++ b/test/fast/modules/crawler/block_pulling.ts
--- a/test/fast/modules/crawler/peers_garbaging.js
+++ b/test/fast/modules/crawler/peers_garbaging.js
--- a/test/fast/modules/keypair/crypto-test.js
+++ b/test/fast/modules/keypair/crypto-test.js
--- a/test/fast/modules/keypair/module-test.js
+++ b/test/fast/modules/keypair/module-test.js
--- a/test/fast/modules/ws2p/host.ts
+++ b/test/fast/modules/ws2p/host.ts
--- a/test/fast/modules/ws2p/single_write.ts
+++ b/test/fast/modules/ws2p/single_write.ts
--- a/test/fast/modules/ws2p/ws2p_regexp.ts
+++ b/test/fast/modules/ws2p/ws2p_regexp.ts
--- a/test/fast/protocol-brg106-number.js
+++ b/test/fast/protocol-brg106-number.js
--- a/test/fast/protocol-brg107-udEffectiveTime.js
+++ b/test/fast/protocol-brg107-udEffectiveTime.js
--- a/test/fast/protocol-brg11-udTime.js
+++ b/test/fast/protocol-brg11-udTime.js
--- a/test/fast/protocol-brg13-dividend.js
+++ b/test/fast/protocol-brg13-dividend.js