From: iancoleman <1281387+iancoleman@users.noreply.github.com>
Date: Thu, 12 Sep 2019 00:14:33 +0000 (+1000)
Subject: Merge pull request #355 from zhanghangorg/master
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=5d1bb7d7763992159befefb7cdca62ad170cdd6a;hp=-c

Merge pull request #355 from zhanghangorg/master

Zencash renamed Horizen
---

5d1bb7d7763992159befefb7cdca62ad170cdd6a
diff --combined src/js/index.js
index ab7cc00,035747c..deb88d4
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -2185,19 -2185,12 +2185,19 @@@
              },
          },
  		{
 -            name: "HUSH - Hush",
 +            name: "HUSH - Hush (Legacy)",
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.hush;
                  setHdCoin(197);
              },
          },
 +		{
 +            name: "HUSH - Hush3",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.hush3;
 +                setHdCoin(197);
 +            },
 +        },
          {
              name: "INSN - Insane",
              onSelect: function() {
@@@ -2867,7 -2860,7 +2867,7 @@@
              },
          },
          {
-             name: "ZEN - Zencash",
+             name: "ZEN - Horizen",
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.zencash;
                  setHdCoin(121);
diff --combined tests/spec/tests.js
index c9c0e6e,f2ca721..76f5297
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -1376,9 -1376,9 +1376,9 @@@ it('Allows selection of Zclassic', func
      };
      testNetwork(done, params);
  });
- it('Allows selection of Zencash', function(done) {
+ it('Allows selection of Horizen', function(done) {
      var params = {
-         selectText: "ZEN - Zencash",
+         selectText: "ZEN - Horizen",
          firstAddress: "znWh9XASyW2dZq5tck84wFjiwuqVysi7q3p",
      };
      testNetwork(done, params);
@@@ -1441,18 -1441,11 +1441,18 @@@ it('Allows selection of Callisto', func
  });
  it('Allows selection of HUSH', function(done) {
      var params = {
 -        selectText: "HUSH - Hush",
 +        selectText: "HUSH - Hush (Legacy)",
          firstAddress: "t1g6rLXUnJaiJuu4q4zmJjoa9Gk4fwKpiuA",
      };
      testNetwork(done, params);
  });
 +it('Allows selection of HUSH3', function(done) {
 +    var params = {
 +        selectText: "HUSH - Hush3",
 +        firstAddress: "RXWSQhwvw5jHPGP8bjwJhWoRnMLBnuPDKD",
 +    };
 +    testNetwork(done, params);
 +});
  it('Allows selection of ExchangeCoin', function(done) {
      var params = {
          selectText: "EXCC - ExchangeCoin",