mirror of https://github.com/BTCPrivate/copay.git
small changes
This commit is contained in:
parent
b13287870f
commit
e14654cd80
|
@ -181,7 +181,7 @@
|
|||
<script type="text/ng-template" id="setup.html">
|
||||
<div ng-controller="SetupController">
|
||||
<div data-alert class="alert-box info round" ng-show="loading">
|
||||
Connecting to wallet...
|
||||
Creating new wallet...
|
||||
</div>
|
||||
<div ng-show="!loading">
|
||||
<div class="row">
|
||||
|
|
|
@ -22,10 +22,11 @@
|
|||
<script src="test.performance.js"></script>
|
||||
<script src="test.PrivateKey.js"></script>
|
||||
<script src="test.PublicKeyRing.js"></script>
|
||||
<script src="test.storage.LocalPlain.js"></script>
|
||||
<script src="test.storage.LocalEncrypted.js"></script>
|
||||
<script src="test.storage.LocalPlain.js"></script>
|
||||
<script src="test.TxProposals.js"></script>
|
||||
<script src="test.Wallet.js"></script>
|
||||
<script src="test.Walletfactory.js"></script>
|
||||
<!--
|
||||
-->
|
||||
<script>
|
||||
|
|
|
@ -7,15 +7,15 @@ var FakeNetwork = require('./mocks/FakeNetwork');
|
|||
var Insight = require('../js/models/blockchain/Insight');
|
||||
var FakeStorage = require('./mocks/FakeStorage');
|
||||
|
||||
var WalletFactory = typeof copay === 'undefined' ? require('soop').load('../js/models/core/WalletFactory',{
|
||||
var WalletFactory = typeof copay === 'undefined' ? require('soop').load('../js/models/core/WalletFactory', {
|
||||
Network: FakeNetwork,
|
||||
Blockchain: Insight,
|
||||
Storage: FakeStorage,
|
||||
}) : copay.WalletFactory;
|
||||
|
||||
|
||||
var addCopayers = function (w) {
|
||||
for(var i=0; i<4; i++) {
|
||||
var addCopayers = function(w) {
|
||||
for (var i = 0; i < 4; i++) {
|
||||
w.publicKeyRing.addCopayer();
|
||||
}
|
||||
};
|
||||
|
@ -34,7 +34,6 @@ describe('WalletFactory model', function() {
|
|||
networkName: 'testnet',
|
||||
};
|
||||
|
||||
describe('factory', function() {
|
||||
it('should create the factory', function() {
|
||||
var wf = new WalletFactory(config);
|
||||
should.exist(wf);
|
||||
|
@ -72,6 +71,14 @@ describe('WalletFactory model', function() {
|
|||
should.exist(w.privateKey.toObj);
|
||||
JSON.stringify(w.toObj()).should.equal(o);
|
||||
});
|
||||
|
||||
|
||||
it('BIP32 length problem', function() {
|
||||
var sconfig = {"networkName":"testnet","network":{"key":"g23ihfh82h35rf","host":"162.242.219.26","port":10009,"path":"/","maxPeers":15,"debug":3},"limits":{"totalCopayers":10,"mPlusN":15},"wallet":{"requiredCopayers":2,"totalCopayers":3,"spendUnconfirmed":1,"verbose":0},"blockchain":{"host":"test.insight.is","port":3001},"socket":{"host":"test.insight.is","port":3001},"verbose":0,"themes":["default"]};
|
||||
var wf = new WalletFactory(sconfig);
|
||||
var opts = {'requiredCopayers': 2, 'totalCopayers':3};
|
||||
var w = wf.create(opts);
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
|
|
@ -50,6 +50,12 @@ var createBundle = function(opts) {
|
|||
b.require('./test/mocks/FakeStorage', {
|
||||
expose: './mocks/FakeStorage'
|
||||
});
|
||||
b.require('./js/models/core/Wallet', {
|
||||
expose: '../js/models/core/Wallet'
|
||||
});
|
||||
b.require('./test/mocks/FakeNetwork', {
|
||||
expose: './mocks/FakeNetwork'
|
||||
});
|
||||
b.require('./js/models/network/WebRTC', {
|
||||
expose: '../js/models/network/WebRTC'
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue