Merge pull request #9662 from gabrielbazan7/fix/tests

cmgustavo · web-flow · commit 4a7ff5cf0de5 · 2019-04-12T16:16:24.000-03:00
[FIX] persistence test and prettier fix
diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts
@@ -359,7 +359,9 @@ export class HomePage {
                 throw this.translate.instant('No wallets available');
               }
               this.payProDetailsData = payProDetails;
-              this.payProDetailsData.host = new URL(payProDetails.payProUrl).host;
+              this.payProDetailsData.host = new URL(
+                payProDetails.payProUrl
+              ).host;
               this.payProDetailsData.coin = coin;
               this.clearCountDownInterval();
               this.paymentTimeControl(this.payProDetailsData.expires);
@@ -510,7 +512,7 @@ export class HomePage {
         this.events.publish('Local/WalletUpdate', {
           walletId: opts.walletId,
           incomplete: false,
-          error: wallet.error,
+          error: wallet.error
         });
 
         if (opts.alsoUpdateHistory) {
@@ -580,11 +582,10 @@ export class HomePage {
     });
   }
 
-  private processWalletError(wallet, err):void {
+  private processWalletError(wallet, err): void {
     wallet.error = wallet.errorObj = null;
 
-    if (!err || err == 'INPROGRESS') 
-      return;
+    if (!err || err == 'INPROGRESS') return;
 
     wallet.cachedStatus = null;
     wallet.errorObj = err;
diff --git a/src/pages/integrations/shapeshift/shapeshift-shift/shapeshift-shift.ts b/src/pages/integrations/shapeshift/shapeshift-shift/shapeshift-shift.ts
@@ -72,12 +72,11 @@ export class ShapeshiftShiftPage {
       return;
     }
 
-
     this.fromWallets = this.profileProvider.getWallets({
       onlyComplete: true,
       network: this.network,
-      hasFunds: true,
-    })
+      hasFunds: true
+    });
 
     if (_.isEmpty(this.fromWallets)) {
       this.showErrorAndBack(
diff --git a/src/pages/settings/wallet-settings/wallet-color/wallet-color.ts b/src/pages/settings/wallet-settings/wallet-color/wallet-color.ts
@@ -50,7 +50,9 @@ export class WalletColorPage {
     opts.colorFor[this.wallet.credentials.walletId] = color;
 
     this.configProvider.set(opts);
-    this.events.publish('Local/ConfigUpdate', {walletId: this.wallet.credentials.walletId} );
+    this.events.publish('Local/ConfigUpdate', {
+      walletId: this.wallet.credentials.walletId
+    });
     this.navCtrl.pop();
   }
 
diff --git a/src/pages/settings/wallet-settings/wallet-name/wallet-name.ts b/src/pages/settings/wallet-settings/wallet-name/wallet-name.ts
@@ -70,7 +70,9 @@ export class WalletNamePage {
       this.wallet.credentials.walletId
     ] = this.walletNameForm.value.walletName;
     this.configProvider.set(opts);
-    this.events.publish('Local/ConfigUpdate', {walletId: this.wallet.credentials.walletId} );
+    this.events.publish('Local/ConfigUpdate', {
+      walletId: this.wallet.credentials.walletId
+    });
     this.navCtrl.pop();
   }
 }
diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-information/wallet-information.ts
@@ -88,7 +88,9 @@ export class WalletInformationPage {
     };
     opts.colorFor[this.wallet.credentials.walletId] = color;
     this.configProvider.set(opts);
-    this.events.publish('Local/ConfigUpdate', {walletId: this.wallet.credentials.walletId} );
+    this.events.publish('Local/ConfigUpdate', {
+      walletId: this.wallet.credentials.walletId
+    });
     this.navCtrl.popToRoot();
   }
 
diff --git a/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-service-url/wallet-service-url.ts b/src/pages/settings/wallet-settings/wallet-settings-advanced/wallet-service-url/wallet-service-url.ts
@@ -107,7 +107,9 @@ export class WalletServiceUrlPage {
     this.persistenceProvider.setCleanAndScanAddresses(
       this.wallet.credentials.walletId
     );
-    this.events.publish('Local/ConfigUpdate', {walletId: this.wallet.credentials.walletId} );
+    this.events.publish('Local/ConfigUpdate', {
+      walletId: this.wallet.credentials.walletId
+    });
     this.navCtrl.popToRoot().then(() => {
       this.reload();
     });
diff --git a/src/pages/wallet-details/wallet-details.ts b/src/pages/wallet-details/wallet-details.ts
@@ -172,8 +172,7 @@ export class WalletDetailsPage extends WalletTabsChild {
   }
 
   private showHistory(loading?: boolean) {
-    if (!this.wallet.completeHistory) 
-      return;
+    if (!this.wallet.completeHistory) return;
 
     this.history = this.wallet.completeHistory.slice(
       0,
@@ -294,9 +293,9 @@ export class WalletDetailsPage extends WalletTabsChild {
         this.showHistory();
 
         // Hide prev history if long downlad is happending...
-      //  if (opts.progress > 5) {
+        //  if (opts.progress > 5) {
         //  this.history = null;
-       //  }
+        //  }
       }
     }
   };
@@ -328,10 +327,7 @@ export class WalletDetailsPage extends WalletTabsChild {
       this.showBalanceButton = false;
 
       let err = this.wallet.errorObj;
-      if (
-        err.name &&
-        err.name.match(/WALLET_NOT_FOUND/)
-      ) {
+      if (err.name && err.name.match(/WALLET_NOT_FOUND/)) {
         this.walletNotRegistered = true;
       }
       if (err === 'WALLET_NOT_REGISTERED') {
diff --git a/src/providers/bitpay-card/bitpay-card.ts b/src/providers/bitpay-card/bitpay-card.ts
@@ -311,7 +311,10 @@ export class BitPayCardProvider {
                   history = data.data || {};
                   history['txs'] = this._processTransactions(invoices, history);
 
-                  this.persistenceProvider.setLastKnownBalance(cardId, history.currentCardBalance);
+                  this.persistenceProvider.setLastKnownBalance(
+                    cardId,
+                    history.currentCardBalance
+                  );
 
                   return cb(data.error, history);
                 },
@@ -453,8 +456,9 @@ export class BitPayCardProvider {
       // Async, no problem
       _.each(cards, x => {
         this.setCurrencySymbol(x);
-        this.persistenceProvider.getLastKnownBalance(x.eid)
-          .then( ({balance=null, updatedOn=null}) => {
+        this.persistenceProvider
+          .getLastKnownBalance(x.eid)
+          .then(({ balance = null, updatedOn = null }) => {
             x.balance = Number(balance);
             x.updateOn = updatedOn;
           });
diff --git a/src/providers/http-requests/http-requests.ts b/src/providers/http-requests/http-requests.ts
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 import { Logger } from '../../providers/logger/logger';
 import { PlatformProvider } from '../platform/platform';
 
-declare var cordova: any;    
+declare var cordova: any;
 
 @Injectable()
 export class HttpRequestsProvider {
@@ -25,17 +25,23 @@ export class HttpRequestsProvider {
     if (this.isIOS) {
       return new Observable(observer => {
         cordova.plugin.http.setDataSerializer('json');
-        cordova.plugin.http.post(url, data, headers, (res) => {
-          try {
-            res.data = JSON.parse(res.data);
-          } catch(e) {
-            // TODO
+        cordova.plugin.http.post(
+          url,
+          data,
+          headers,
+          res => {
+            try {
+              res.data = JSON.parse(res.data);
+            } catch (e) {
+              // TODO
+            }
+            observer.next(res.data);
+            observer.complete();
+          },
+          err => {
+            observer.error(err.error);
           }
-          observer.next(res.data);
-          observer.complete();
-        }, (err) => {
-          observer.error(err.error);
-        });
+        );
       });
     } else return this.http.post(url, data, { headers });
   }
@@ -44,17 +50,23 @@ export class HttpRequestsProvider {
     if (this.isIOS) {
       return new Observable(observer => {
         cordova.plugin.http.setDataSerializer('json');
-        cordova.plugin.http.get(url, params, headers, (res) => {
-          try {
-            res.data = JSON.parse(res.data);
-          } catch(e) {
-            // TODO
+        cordova.plugin.http.get(
+          url,
+          params,
+          headers,
+          res => {
+            try {
+              res.data = JSON.parse(res.data);
+            } catch (e) {
+              // TODO
+            }
+            observer.next(res.data);
+            observer.complete();
+          },
+          err => {
+            observer.error(err.error);
           }
-          observer.next(res.data);
-          observer.complete();
-        }, (err) => {
-          observer.error(err.error);
-        });
+        );
       });
     } else return this.http.get(url, { headers });
   }
diff --git a/src/providers/persistence/persistence.spec.ts b/src/providers/persistence/persistence.spec.ts
@@ -108,28 +108,6 @@ describe('Persistence Provider', () => {
         });
     });
 
-    it('should be able to delete a profile', done => {
-      const p = { name: 'My profile' };
-      persistenceProvider
-        .storeNewProfile(p)
-        .catch(err => expect(err).toBeNull)
-        .then(() => {
-          return persistenceProvider.getProfile();
-        })
-        .then(profile => {
-          expect(typeof profile).toEqual('object');
-          expect(profile.name).toEqual('My profile');
-          return persistenceProvider.deleteProfile();
-        })
-        .then(() => {
-          return persistenceProvider.getProfile();
-        })
-        .then(profile => {
-          expect(profile).toBeNull();
-        })
-        .then(done);
-    });
-
     it('should store profile', done => {
       const p = { name: 'My profile' };
       persistenceProvider
diff --git a/src/providers/persistence/persistence.ts b/src/providers/persistence/persistence.ts
@@ -304,7 +304,7 @@ export class PersistenceProvider {
     let updatedOn = Math.floor(Date.now() / 1000);
     return this.storage.set(Keys.BALANCE_CACHE(id), {
       updatedOn,
-      balance,
+      balance
     });
   }
 
diff --git a/src/providers/profile/profile.ts b/src/providers/profile/profile.ts
@@ -77,7 +77,6 @@ export class ProfileProvider {
         derivationPath: this.derivationPathHelperProvider.defaultTestnet
       }
     ];
-
   }
 
   private updateWalletFromConfig(wallet): void {
@@ -1464,15 +1463,14 @@ export class ProfileProvider {
 
     // Add cached balance async
     _.each(ret, x => {
-      this.persistenceProvider.getLastKnownBalance(x.id)
-        .then( (datum) => {
-          // this.logger.debug("Last known balance for ",x.id,datum);
-          datum = datum || {};
-          let limit = Math.floor(Date.now() / 1000) - 2 * 60;
-          let {balance=null, updatedOn=null} = datum; 
-          x.lastKnownBalance = balance;
-          x.lastKnownBalanceUpdatedOn = updatedOn < limit ? updatedOn : null;
-        });
+      this.persistenceProvider.getLastKnownBalance(x.id).then(datum => {
+        // this.logger.debug("Last known balance for ",x.id,datum);
+        datum = datum || {};
+        let limit = Math.floor(Date.now() / 1000) - 2 * 60;
+        let { balance = null, updatedOn = null } = datum;
+        x.lastKnownBalance = balance;
+        x.lastKnownBalanceUpdatedOn = updatedOn < limit ? updatedOn : null;
+      });
     });
 
     return _.sortBy(ret, 'order');
diff --git a/src/providers/shapeshift/shapeshift.ts b/src/providers/shapeshift/shapeshift.ts
@@ -158,17 +158,19 @@ export class ShapeshiftProvider {
   }
 
   public getMarketInfo(pair: string, cb) {
-    this.httpNative.get(this.credentials.API_URL + '/marketinfo/' + pair).subscribe(
-      data => {
-        this.logger.info('Shapeshift MARKET INFO: SUCCESS');
-        return cb(null, data);
-      },
-      data => {
-        const error = this.parseError(data);
-        this.logger.error('Shapeshift MARKET INFO ERROR: ', error);
-        return cb(data);
-      }
-    );
+    this.httpNative
+      .get(this.credentials.API_URL + '/marketinfo/' + pair)
+      .subscribe(
+        data => {
+          this.logger.info('Shapeshift MARKET INFO: SUCCESS');
+          return cb(null, data);
+        },
+        data => {
+          const error = this.parseError(data);
+          this.logger.error('Shapeshift MARKET INFO ERROR: ', error);
+          return cb(data);
+        }
+      );
   }
 
   public getStatus(addr: string, token: string, cb) {
diff --git a/src/providers/wallet/wallet.ts b/src/providers/wallet/wallet.ts
@@ -643,8 +643,7 @@ export class WalletProvider {
 
       if (WalletProvider.historyUpdateOnProgress[wallet.id]) {
         this.logger.debug(
-          '!! History update already on progress for: ' +
-            wallet.id
+          '!! History update already on progress for: ' + wallet.id
         );
 
         if (progressFn) {
@@ -676,7 +675,11 @@ export class WalletProvider {
             complete: false
           });
 
-          const getNewTxs = (newTxs, skip: number, tries: number = 0): Promise<any> => {
+          const getNewTxs = (
+            newTxs,
+            skip: number,
+            tries: number = 0
+          ): Promise<any> => {
             return new Promise((resolve, reject) => {
               this.fetchTxsFromServer(wallet, skip, endingTxid, requestLimit)
                 .then(result => {
@@ -736,12 +739,10 @@ export class WalletProvider {
                     err instanceof this.errors.CONNECTION_ERROR ||
                     (err.message && err.message.match(/5../))
                   ) {
-
-                    if (tries>1) 
-                      return reject(err);
+                    if (tries > 1) return reject(err);
 
                     return setTimeout(() => {
-                      return resolve(getNewTxs(newTxs, skip, ++tries))
+                      return resolve(getNewTxs(newTxs, skip, ++tries));
                     }, 2000 + 3000 * tries);
                   } else {
                     return reject(err);

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,9 @@ export class WalletColorPage {`
`50`	`50`	`opts.colorFor[this.wallet.credentials.walletId] = color;`
`51`	`51`
`52`	`52`	`this.configProvider.set(opts);`
`53`		`- this.events.publish('Local/ConfigUpdate', {walletId: this.wallet.credentials.walletId} );`
	`53`	`+ this.events.publish('Local/ConfigUpdate', {`
	`54`	`+ walletId: this.wallet.credentials.walletId`
	`55`	`+ });`
`54`	`56`	`this.navCtrl.pop();`
`55`	`57`	`}`
`56`	`58`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,9 @@ export class WalletNamePage {`
`70`	`70`	`this.wallet.credentials.walletId`
`71`	`71`	`] = this.walletNameForm.value.walletName;`
`72`	`72`	`this.configProvider.set(opts);`
`73`		`- this.events.publish('Local/ConfigUpdate', {walletId: this.wallet.credentials.walletId} );`
	`73`	`+ this.events.publish('Local/ConfigUpdate', {`
	`74`	`+ walletId: this.wallet.credentials.walletId`
	`75`	`+ });`
`74`	`76`	`this.navCtrl.pop();`
`75`	`77`	`}`
`76`	`78`	`}`