feat: remove totalBalance

nervosnetwork · Nov 11, 2019 · 5b0df6f · 5b0df6f
1 parent 1bc25eb
commit 5b0df6f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 16 deletions.
diff --git a/packages/neuron-wallet/src/database/address/dao.ts b/packages/neuron-wallet/src/database/address/dao.ts
@@ -20,7 +20,6 @@ export interface Address {
   sentBalance: string
   pendingBalance: string
   balance: string
-  totalBalance: string
   blake160: string
   version: AddressVersion
   description?: string
@@ -54,7 +53,6 @@ export default class AddressDao {
   // pendingBalance means balance of OutputStatus.Pending cells (sent from me, but not committed)
   // so the final balance is (liveBalance + sentBalance - pendingBalance)
   // balance is the balance of the cells those who don't hold data or type script
-  // totalBalance means balance of all cells, including those who hold data and type script
   public static updateTxCountAndBalance = async (
     address: string,
     url: string = NodeService.getInstance().core.rpc.node.url
@@ -78,7 +76,6 @@ export default class AddressDao {
         addressEntity.liveBalance = await CellsService.getBalance(lockHashes, OutputStatus.Live)
         addressEntity.sentBalance = await CellsService.getBalance(lockHashes, OutputStatus.Sent)
         addressEntity.pendingBalance = await CellsService.getBalance(lockHashes, OutputStatus.Pending)
-        addressEntity.totalBalance = '0'
         return addressEntity
       })
     )

diff --git a/packages/neuron-wallet/src/database/address/entities/address.ts b/packages/neuron-wallet/src/database/address/entities/address.ts
@@ -73,9 +73,6 @@ export default class Address extends BaseEntity {
   @Column()
   pendingBalance: string = '0'
 
-  @Column()
-  totalBalance: string = '0'
-
   public balance = (): string => {
     return (BigInt(this.liveBalance) + BigInt(this.sentBalance)).toString()
   }
@@ -94,7 +91,6 @@ export default class Address extends BaseEntity {
       sentBalance: this.sentBalance,
       pendingBalance: this.pendingBalance,
       balance: this.balance(),
-      totalBalance: this.totalBalance,
       description: this.description,
     }
   }

diff --git a/packages/neuron-wallet/src/database/address/migrations/1573458655136-RemoveTotalBalance.ts b/packages/neuron-wallet/src/database/address/migrations/1573458655136-RemoveTotalBalance.ts
@@ -0,0 +1,17 @@
+import {MigrationInterface, QueryRunner, TableColumn} from "typeorm";
+
+export class RemoveTotalBalance1573458655136 implements MigrationInterface {
+
+  public async up(queryRunner: QueryRunner): Promise<any> {
+    await queryRunner.dropColumn('address', 'totalBalance')
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<any> {
+    await queryRunner.addColumn('address', new TableColumn({
+      name: 'totalBalance',
+      type: 'varchar',
+      default: '0',
+    }))
+  }
+
+}
diff --git a/packages/neuron-wallet/src/database/address/ormconfig.ts b/packages/neuron-wallet/src/database/address/ormconfig.ts
@@ -9,6 +9,7 @@ import Address from './entities/address'
 import { AddAddress1561461669542 } from './migrations/1561461669542-AddAddress'
 import { extendBalance1562126909151 } from './migrations/1562126909151-extendBalance'
 import { AddTotalBalance1567485550388 } from './migrations/1567485550388-AddTotalBalance'
+import { RemoveTotalBalance1573458655136 } from './migrations/1573458655136-RemoveTotalBalance'
 
 const dbPath = path.join(env.fileBasePath, 'address.sqlite')
 
@@ -21,7 +22,12 @@ const connectOptions = (): SqliteConnectionOptions => {
     type: 'sqlite',
     database,
     entities: [Address],
-    migrations: [AddAddress1561461669542, extendBalance1562126909151, AddTotalBalance1567485550388],
+    migrations: [
+      AddAddress1561461669542,
+      extendBalance1562126909151,
+      AddTotalBalance1567485550388,
+      RemoveTotalBalance1573458655136,
+    ],
     synchronize: false,
     migrationsRun: true,
     logging: ['error'],

diff --git a/packages/neuron-wallet/src/services/addresses.ts b/packages/neuron-wallet/src/services/addresses.ts
@@ -181,7 +181,6 @@ export default class AddressService {
       sentBalance: '0',
       pendingBalance: '0',
       balance: '0',
-      totalBalance: '0',
       blake160,
       version: AddressVersion.Testnet,
     }

diff --git a/packages/neuron-wallet/tests/database/address/balance.test.ts b/packages/neuron-wallet/tests/database/address/balance.test.ts
@@ -35,7 +35,6 @@ describe('balance', () => {
       sentBalance: sentBalance.toString(),
       pendingBalance: pendingBalance.toString(),
       balance: '0',
-      totalBalance: '0',
       blake160: '0x36c329ed630d6ce750712a477543672adab57f4c',
       version: AddressVersion.Testnet,
     }

diff --git a/packages/neuron-wallet/tests/database/address/dao.test.ts b/packages/neuron-wallet/tests/database/address/dao.test.ts
@@ -15,7 +15,6 @@ describe('Address Dao tests', () => {
     sentBalance: '0',
     pendingBalance: '0',
     balance: '0',
-    totalBalance: '0',
     blake160: '0x36c329ed630d6ce750712a477543672adab57f4c',
     version: AddressVersion.Testnet,
   }
@@ -31,7 +30,6 @@ describe('Address Dao tests', () => {
     sentBalance: '0',
     pendingBalance: '0',
     balance: '0',
-    totalBalance: '0',
     blake160: '0x36c329ed630d6ce750712a477543672adab57f4c',
     version: AddressVersion.Testnet,
   }
@@ -47,7 +45,6 @@ describe('Address Dao tests', () => {
     sentBalance: '0',
     pendingBalance: '0',
     balance: '0',
-    totalBalance: '0',
     blake160: '0x36c329ed630d6ce750712a477543672adab57f4c',
     version: AddressVersion.Testnet,
   }

diff --git a/packages/neuron-wallet/tests/services/address.test.ts b/packages/neuron-wallet/tests/services/address.test.ts
@@ -54,7 +54,6 @@ describe('Key tests with db', () => {
     sentBalance: '0',
     pendingBalance: '0',
     balance: '0',
-    totalBalance: '0',
     blake160: '0x36c329ed630d6ce750712a477543672adab57f4c',
     version: AddressVersion.Testnet,
   }
@@ -70,7 +69,6 @@ describe('Key tests with db', () => {
     sentBalance: '0',
     pendingBalance: '0',
     balance: '0',
-    totalBalance: '0',
     blake160: '0x36c329ed630d6ce750712a477543672adab57f4c',
     version: AddressVersion.Testnet,
   }
@@ -86,7 +84,6 @@ describe('Key tests with db', () => {
     sentBalance: '0',
     pendingBalance: '0',
     balance: '0',
-    totalBalance: '0',
     blake160: '0x36c329ed630d6ce750712a477543672adab57f4c',
     version: AddressVersion.Testnet,
   }