Merge 85def8a into 12497b3

symbol · May 26, 2020 · b231524 · b231524
2 parents 12497b3 + 85def8a
commit b231524
Show file tree

Hide file tree

Showing 47 changed files with 294 additions and 252 deletions.
diff --git a/src/commands/account/aggregatebonded.ts b/src/commands/account/aggregatebonded.ts
@@ -19,7 +19,7 @@ import { command, metadata } from 'clime';
 
 import { AccountTransactionsCommand, AccountTransactionsOptions } from '../../interfaces/account.transactions.command';
 import { AddressResolver } from '../../resolvers/address.resolver';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 import { TransactionView } from '../../views/transactions/details/transaction.view';
 
 @command({
@@ -45,12 +45,12 @@ export default class extends AccountTransactionsCommand {
                 });
 
                 if (!transactions.length) {
-                    console.log("There aren't aggregate bonded transaction");
+                    console.log(FormatterService.error("There aren't aggregate bonded transaction"));
                 }
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }

diff --git a/src/commands/account/generate.ts b/src/commands/account/generate.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  *
  */
-import chalk from 'chalk';
 import { command, metadata, option } from 'clime';
 import { MnemonicPassPhrase } from 'symbol-hd-wallets';
 import { Account } from 'symbol-sdk';
@@ -36,6 +35,7 @@ import { ProfileNameResolver } from '../../resolvers/profile.resolver';
 import { SaveResolver } from '../../resolvers/save.resolver';
 import { URLResolver } from '../../resolvers/url.resolver';
 import { DerivationService } from '../../services/derivation.service';
+import { FormatterService } from '../../services/formatter.service';
 
 export class CommandOptions extends CreateProfileOptions {
     @option({
@@ -110,6 +110,6 @@ export default class extends CreateProfileCommand {
         }
 
         console.log(AccountCredentialsTable.createFromProfile(profile, password).toString());
-        console.log(chalk.green('\nStored ' + name + ' profile'));
+        console.log(FormatterService.success('Stored ' + name + ' profile'));
     }
 }
diff --git a/src/commands/account/incoming.ts b/src/commands/account/incoming.ts
@@ -19,7 +19,7 @@ import { command, metadata } from 'clime';
 
 import { AccountTransactionsCommand, AccountTransactionsOptions } from '../../interfaces/account.transactions.command';
 import { AddressResolver } from '../../resolvers/address.resolver';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 import { TransactionView } from '../../views/transactions/details/transaction.view';
 
 @command({
@@ -45,12 +45,12 @@ export default class extends AccountTransactionsCommand {
                 });
 
                 if (!transactions.length) {
-                    console.log("There aren't incoming transaction");
+                    console.log(FormatterService.error("There aren't incoming transaction"));
                 }
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }

diff --git a/src/commands/account/info.ts b/src/commands/account/info.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  *
  */
-import chalk from 'chalk';
 import * as Table from 'cli-table3';
 import { HorizontalTable } from 'cli-table3';
 import { command, metadata, option } from 'clime';
@@ -26,7 +25,7 @@ import { AccountInfo, MosaicAmountView, MosaicService, MultisigAccountInfo, Publ
 import { ProfileCommand } from '../../interfaces/profile.command';
 import { ProfileOptions } from '../../interfaces/profile.options';
 import { AddressResolver } from '../../resolvers/address.resolver';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 
 export class CommandOptions extends ProfileOptions {
     @option({
@@ -55,8 +54,8 @@ export class AccountInfoTable {
 
     toString(): string {
         let text = '';
-        text += '\n' + chalk.green('Account Information') + '\n';
-        text += this.table.toString();
+        text += '\n' + FormatterService.title('Account Information');
+        text += '\n' + this.table.toString();
         return text;
     }
 }
@@ -86,8 +85,8 @@ export class BalanceInfoTable {
     toString(): string {
         let text = '';
         if (this.table) {
-            text += '\n' + chalk.green('Balance Information') + '\n';
-            text += this.table.toString();
+            text += '\n' + FormatterService.title('Balance Information');
+            text += '\n' + this.table.toString();
         }
         return text;
     }
@@ -131,14 +130,14 @@ export class MultisigInfoTable {
     toString(): string {
         let text = '';
         if (this.multisigTable) {
-            text += chalk.green('\n' + 'Multisig Account Information') + '\n';
+            text += FormatterService.title('Multisig Account Information');
             text += this.multisigTable.toString();
-            text += chalk.green('\n' + 'Cosignatories') + '\n';
-            text += this.cosignatoriesTable.toString();
+            text += FormatterService.title('Cosignatories');
+            text += '\n' + this.cosignatoriesTable.toString();
         }
         if (this.cosignatoryOfTable) {
-            text += chalk.green('\n' + 'Is cosignatory of') + '\n';
-            text += this.cosignatoryOfTable.toString();
+            text += FormatterService.title('Is cosignatory of');
+            text += '\n' + this.cosignatoryOfTable.toString();
         }
         return text;
     }
@@ -185,12 +184,9 @@ export default class extends ProfileCommand {
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
-                if (err instanceof Object && 'message' in err && JSON.parse(err.message).statusCode === 404) {
-                    console.log(
-                        chalk.blue('Info'),
-                        'The account has to receive at least ' + 'one transaction to be recorded on the network.',
-                    );
+                console.log(FormatterService.error(err));
+                if (err instanceof Object) {
+                    console.log(FormatterService.info('The account has to receive at least one transaction to be recorded on the network'));
                 }
             },
         );

diff --git a/src/commands/account/outgoing.ts b/src/commands/account/outgoing.ts
@@ -19,7 +19,7 @@ import { command, metadata } from 'clime';
 
 import { AccountTransactionsCommand, AccountTransactionsOptions } from '../../interfaces/account.transactions.command';
 import { AddressResolver } from '../../resolvers/address.resolver';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 import { TransactionView } from '../../views/transactions/details/transaction.view';
 
 @command({
@@ -45,12 +45,12 @@ export default class extends AccountTransactionsCommand {
                 });
 
                 if (!transactions.length) {
-                    console.log("There aren't outgoing transaction");
+                    console.log(FormatterService.error("There aren't outgoing transaction"));
                 }
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }

diff --git a/src/commands/account/transactions.ts b/src/commands/account/transactions.ts
@@ -19,7 +19,7 @@ import { command, metadata } from 'clime';
 
 import { AccountTransactionsCommand, AccountTransactionsOptions } from '../../interfaces/account.transactions.command';
 import { AddressResolver } from '../../resolvers/address.resolver';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 import { TransactionView } from '../../views/transactions/details/transaction.view';
 
 @command({
@@ -42,7 +42,7 @@ export default class extends AccountTransactionsCommand {
                 this.spinner.stop(true);
 
                 if (!transactions.length) {
-                    console.log("There aren't transactions");
+                    console.log(FormatterService.error("There aren't transactions"));
                 }
 
                 transactions.forEach((transaction) => {
@@ -51,7 +51,7 @@ export default class extends AccountTransactionsCommand {
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }

diff --git a/src/commands/account/unconfirmed.ts b/src/commands/account/unconfirmed.ts
@@ -19,7 +19,7 @@ import { command, metadata } from 'clime';
 
 import { AccountTransactionsCommand, AccountTransactionsOptions } from '../../interfaces/account.transactions.command';
 import { AddressResolver } from '../../resolvers/address.resolver';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 import { TransactionView } from '../../views/transactions/details/transaction.view';
 
 @command({
@@ -45,12 +45,12 @@ export default class extends AccountTransactionsCommand {
                 });
 
                 if (!transactions.length) {
-                    console.log("There aren't unconfirmed transactions");
+                    console.log(FormatterService.error("There aren't unconfirmed transactions"));
                 }
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }

diff --git a/src/commands/block/header.ts b/src/commands/block/header.ts
@@ -16,7 +16,6 @@
  *
  */
 
-import chalk from 'chalk';
 import * as Table from 'cli-table3';
 import { HorizontalTable } from 'cli-table3';
 import { command, metadata, option } from 'clime';
@@ -25,7 +24,7 @@ import { BlockInfo, NetworkType } from 'symbol-sdk';
 import { ProfileCommand } from '../../interfaces/profile.command';
 import { ProfileOptions } from '../../interfaces/profile.options';
 import { HeightResolver } from '../../resolvers/height.resolver';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 
 export class CommandOptions extends ProfileOptions {
     @option({
@@ -67,8 +66,8 @@ export class BlockHeaderTable {
 
     toString(): string {
         let text = '';
-        text += '\n' + chalk.green('Block Header') + '\n';
-        text += this.table.toString();
+        text += '\n' + FormatterService.title('Block Header');
+        text += '\n' + this.table.toString();
         return text;
     }
 }
@@ -95,7 +94,7 @@ export default class extends ProfileCommand {
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }

diff --git a/src/commands/block/receipts.ts b/src/commands/block/receipts.ts
@@ -20,7 +20,7 @@ import { command, metadata, option } from 'clime';
 import { ProfileCommand } from '../../interfaces/profile.command';
 import { ProfileOptions } from '../../interfaces/profile.options';
 import { HeightResolver } from '../../resolvers/height.resolver';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 import { StatementsView } from '../../views/statements/statements.view';
 
 export class CommandOptions extends ProfileOptions {
@@ -53,7 +53,7 @@ export default class extends ProfileCommand {
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }

diff --git a/src/commands/block/transactions.ts b/src/commands/block/transactions.ts
@@ -19,7 +19,7 @@ import { command, metadata, option } from 'clime';
 
 import { AccountTransactionsCommand, AccountTransactionsOptions } from '../../interfaces/account.transactions.command';
 import { HeightResolver } from '../../resolvers/height.resolver';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 import { TransactionView } from '../../views/transactions/details/transaction.view';
 
 export class CommandOptions extends AccountTransactionsOptions {
@@ -50,16 +50,16 @@ export default class extends AccountTransactionsCommand {
                 this.spinner.stop(true);
 
                 if (!transactions.length) {
-                    console.log("There aren't transactions");
+                    console.log(FormatterService.error('The block ' + height.toString() + ' does not have transactions'));
                 }
-
+                console.log(FormatterService.title('Transactions'));
                 transactions.forEach((transaction) => {
                     new TransactionView(transaction).print();
                 });
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }

diff --git a/src/commands/chain/height.ts b/src/commands/chain/height.ts
@@ -19,7 +19,7 @@ import { command, metadata } from 'clime';
 
 import { ProfileCommand } from '../../interfaces/profile.command';
 import { ProfileOptions } from '../../interfaces/profile.options';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 
 @command({
     description: 'Get the current height of the chain',
@@ -42,7 +42,7 @@ export default class extends ProfileCommand {
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }

diff --git a/src/commands/chain/score.ts b/src/commands/chain/score.ts
@@ -15,15 +15,14 @@
  * limitations under the License.
  *
  */
-import chalk from 'chalk';
 import * as Table from 'cli-table3';
 import { HorizontalTable } from 'cli-table3';
 import { command, metadata } from 'clime';
 import { BlockchainScore } from 'symbol-sdk';
 
 import { ProfileCommand } from '../../interfaces/profile.command';
 import { ProfileOptions } from '../../interfaces/profile.options';
-import { HttpErrorHandler } from '../../services/httpErrorHandler.service';
+import { FormatterService } from '../../services/formatter.service';
 
 export class ChainScoreTable {
     private readonly table: HorizontalTable;
@@ -37,8 +36,8 @@ export class ChainScoreTable {
 
     toString(): string {
         let text = '';
-        text += '\n' + chalk.green('Storage Information') + '\n';
-        text += this.table.toString();
+        text += FormatterService.title('Storage Information');
+        text += '\n' + this.table.toString();
         return text;
     }
 }
@@ -64,7 +63,7 @@ export default class extends ProfileCommand {
             },
             (err) => {
                 this.spinner.stop(true);
-                console.log(HttpErrorHandler.handleError(err));
+                console.log(FormatterService.error(err));
             },
         );
     }