From 09ee406106e938f2a581ea4ed5b7bd39f7f394a1 Mon Sep 17 00:00:00 2001
From: Wei Lu <luwei.here@gmail.com>
Date: Fri, 28 Feb 2014 11:52:19 +0800
Subject: [PATCH] Revert "Merge pull request #27 from xnova/master"

due to broken tests, moved the changes to branch hd-testnet-support

This reverts commit a4ba59e9bacd27191d59959793f8b67eade987c2, reversing
changes made to 36d3d6ebaaa0f99a35c8e0bba765037e006efbc9.
---
 src/hdwallet.js | 10 ++++------
 test/wallet.js  | 17 -----------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/hdwallet.js b/src/hdwallet.js
index f40582f..00a02c0 100644
--- a/src/hdwallet.js
+++ b/src/hdwallet.js
@@ -13,8 +13,7 @@ var HDWallet = module.exports = function(seed, network) {
 
     var I = Crypto.HMAC(Crypto.SHA512, seed, 'Bitcoin seed', { asBytes: true })
     this.chaincode = I.slice(32)
-    this.keyVersion = network == 'Bitcoin' ? Address.address_types.prod : Address.address_types.testnet
-    this.priv = new ECKey(I.slice(0, 32).concat([1]), true, this.keyVersion)
+    this.priv = new ECKey(I.slice(0, 32).concat([1]), true)
     this.pub = this.priv.getPub()
     this.network = network || 'Bitcoin'
     this.index = 0
@@ -107,10 +106,10 @@ HDWallet.fromBytes = function(input) {
     // 33 bytes: the public key or private key data (0x02 + X or 0x03 + X for
     // public keys, 0x00 + k for private keys)
     if (type == 'private') {
-        hd.priv = new ECKey(input.slice(46, 78).concat([1]), true, this.keyVersion)
+        hd.priv = new ECKey(input.slice(46, 78).concat([1]), true)
         hd.pub = hd.priv.getPub()
     } else {
-        hd.pub = new ECPubKey(input.slice(45, 78), true, this.keyVersion)
+        hd.pub = new ECPubKey(input.slice(45, 78), true)
     }
 
     return hd
@@ -214,11 +213,10 @@ HDWallet.prototype.derive = function(i) {
         // ki = IL + kpar (mod n).
         hd.priv = this.priv.add(new ECKey(IL.concat([1])))
         hd.priv.compressed = true
-        hd.priv.version = this.keyVersion
         hd.pub = hd.priv.getPub()
     } else {
         // Ki = (IL + kpar)*G = IL*G + Kpar
-        hd.pub = this.pub.add(new ECKey(IL.concat([1]), true, this.keyVersion).getPub())
+        hd.pub = this.pub.add(new ECKey(IL.concat([1])).getPub())
     }
 
     // ci = IR.
diff --git a/test/wallet.js b/test/wallet.js
index 44f6164..0f39d02 100644
--- a/test/wallet.js
+++ b/test/wallet.js
@@ -1,5 +1,4 @@
 var Wallet = require('../src/wallet.js')
-var Address = require('../src/address.js')
 var assert = require('assert')
 
 describe('Wallet', function() {
@@ -34,20 +33,4 @@ describe('Wallet', function() {
       assert.equal(wallet.derivationMethod, 'public')
     })
   })
-
-  describe('networkType', function() {
-    it('ensures that a mainnet Wallet has mainnet child keys (pub and priv)', function() {
-        var w = Wallet("foobar", {network: "Bitcoin"})
-        assert(w.getMasterKey().priv.version == Address.address_types['prod'])
-        w.generateAddress()
-        assert(w.getPrivateKey(0).priv.version == Address.address_types['prod'])
-    })
-
-    it('ensures that a testnet Wallet has testnet child keys (pub and priv)', function() {
-        var w = Wallet("foobar", {network: "BitcoinTest"})
-        assert(w.getMasterKey().priv.version == Address.address_types['testnet'])
-        w.generateAddress()
-        assert(w.getPrivateKey(0).priv.version == Address.address_types['testnet'])
-    })
-  })
 })