Merge pull request #58 from maraoz/add/encrypted-storage2

Add/encrypted storage2
This commit is contained in:
Manuel Aráoz 2014-04-15 19:19:30 -03:00
commit 8f15578bb4
3 changed files with 8 additions and 6 deletions

4
API.js
View File

@ -12,8 +12,8 @@ API.prototype._init = function(opts) {
var Wallet = require('soop').load('./js/models/core/Wallet', {
Storage: opts.Storage || require('./test/FakeStorage'),
Network: opts.Network || require('./js/models/Network/WebRTC'),
Blockchain: opts.Blockchain || require('./js/models/Blockchain/Insight')
Network: opts.Network || require('./js/models/network/WebRTC'),
Blockchain: opts.Blockchain || require('./js/models/blockchain/Insight')
});
var config = {

View File

@ -4,18 +4,20 @@ var imports = require('soop').imports();
//var buffertools = imports.buffertools || require('buffertools');
var parent = imports.parent || require('./Plain');
var id = 0;
function Storage() {
this.__uniqueid = ++id;
}
Storage.parent = parent;
var passphrase = null;
var pps = {};
Storage.prototype._getPassphrase = function() {
return passphrase;
return pps[this.__uniqueid];
}
Storage.prototype._setPassphrase = function(password) {
passphrase = password;
pps[this.__uniqueid] = password;
}
Storage.prototype._encrypt = function(data) {

View File

@ -16,7 +16,7 @@ if (typeof process === 'undefined' || !process.version) {
var s = new Encrypted();
should.exist(s);
});
it.skip('should fail when encrypting without a password', function() {
it('should fail when encrypting without a password', function() {
var s = new Encrypted();
(function(){s.set(wid, 'x', 1);}).should.throw();
});