anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

rm Identity#import

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-09-27 17:14:49 -03:00
commit c4c7dc8eb1
5 changed files with 18 additions and 392 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/models/Identity.js
View file

@ -125,20 +125,6 @@ Identity.prototype.fromEncryptedObj = function(base64, passphrase, skipFields) {
return this.fromObj(walletObj, skipFields);
};
/**
* @TODO: import is a reserved keyword! DONT USE IT
* @TODO: this is essentialy the same method as {@link Identity#fromEncryptedObj}!
* @desc Imports a wallet from an encrypted base64 object
* @param {string} base64 - the base64 encoded object
* @param {string} passphrase - passphrase to decrypt it
* @param {string[]} skipFields - fields to ignore when importing
* @return {Wallet}
*/
Identity.prototype.import = function(base64, passphrase, skipFields) {
var self = this;
return self.fromEncryptedObj(base64, passphrase, skipFields);
};
Identity.prototype.migrateWallet = function(walletId, passphrase, cb) {
var self = this;
@ -173,7 +159,7 @@ Identity.prototype.read = function(walletId, skipFields, cb) {
err;
var obj = {};
this.storage.readWallet(walletId, function(err, ret) {
this.storage.getFirst('wallet::' + walletId, function(err, ret) {
if (err) return cb(err);
_.each(Wallet.PERSISTED_PROPERTIES, function(p) {
@ -513,4 +499,5 @@ Identity.prototype.joinCreateSession = function(opts, cb) {
});
};
module.exports = Identity;