From 72bbbed9b66a7775e7b7713d484926dfa693ab36 Mon Sep 17 00:00:00 2001
From: neeboo <neeboo@firestack.one>
Date: Fri, 25 Oct 2019 13:39:25 +0800
Subject: [PATCH] chore(transaction):rename base.ts to transactionBase.ts, and
 fix build script

---
 package.json                                              | 2 +-
 packages/harmony-transaction/src/index.ts                 | 3 ++-
 packages/harmony-transaction/src/transaction.ts           | 2 +-
 .../src/{base.ts => transactionBase.ts}                   | 0
 tsconfig.json                                             | 2 +-
 tsconfig.test.json                                        | 8 ++++----
 6 files changed, 9 insertions(+), 8 deletions(-)
 rename packages/harmony-transaction/src/{base.ts => transactionBase.ts} (100%)

diff --git a/package.json b/package.json
index 4a9fe30..f743509 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "bootstrap": "lerna bootstrap && yarn build",
     "watch": "yarn build:ts -w",
-    "build": "yarn packages:clean && yarn build:ts",
+    "build": "yarn packages:clean && lerna clean -y && yarn build:ts",
     "build:ts": "tsc -b tsconfig.json",
     "build:test": "tsc -b tsconfig.test.json",
     "build:e2e": "tsc -b tsconfig.e2e.json",
diff --git a/packages/harmony-transaction/src/index.ts b/packages/harmony-transaction/src/index.ts
index 86c230e..633c81c 100644
--- a/packages/harmony-transaction/src/index.ts
+++ b/packages/harmony-transaction/src/index.ts
@@ -3,4 +3,5 @@ export * from './transaction';
 export * from './shardingTransaction';
 export * from './types';
 export * from './utils';
-export * from './base';
+export * from './transactionBase';
+export * from './abstractTransaction';
diff --git a/packages/harmony-transaction/src/transaction.ts b/packages/harmony-transaction/src/transaction.ts
index b8abb23..92f6481 100644
--- a/packages/harmony-transaction/src/transaction.ts
+++ b/packages/harmony-transaction/src/transaction.ts
@@ -18,7 +18,7 @@ import {
   recoverETH,
 } from './utils';
 
-import { TransactionBase } from './base';
+import { TransactionBase } from './transactionBase';
 
 class Transaction extends TransactionBase {
   private from: string;
diff --git a/packages/harmony-transaction/src/base.ts b/packages/harmony-transaction/src/transactionBase.ts
similarity index 100%
rename from packages/harmony-transaction/src/base.ts
rename to packages/harmony-transaction/src/transactionBase.ts
diff --git a/tsconfig.json b/tsconfig.json
index 971d5f3..ef2d3f9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,8 +4,8 @@
     { "path": "packages/harmony-utils" },
     { "path": "packages/harmony-crypto" },
     { "path": "packages/harmony-network" },
-    { "path": "packages/harmony-staking" },
     { "path": "packages/harmony-transaction" },
+    { "path": "packages/harmony-staking" },
     { "path": "packages/harmony-account" },
     { "path": "packages/harmony-contract" },
     { "path": "packages/harmony-core" }
diff --git a/tsconfig.test.json b/tsconfig.test.json
index 3c479d7..1b9b855 100644
--- a/tsconfig.test.json
+++ b/tsconfig.test.json
@@ -3,13 +3,13 @@
   "files": [],
   "include": ["./typings/**/*.d.ts"],
   "references": [
-    { "path": "packages/harmony-core" },
-    { "path": "packages/harmony-account" },
-    { "path": "packages/harmony-crypto" },
     { "path": "packages/harmony-utils" },
+    { "path": "packages/harmony-crypto" },
     { "path": "packages/harmony-network" },
     { "path": "packages/harmony-transaction" },
     { "path": "packages/harmony-staking" },
-    { "path": "packages/harmony-contract" }
+    { "path": "packages/harmony-account" },
+    { "path": "packages/harmony-contract" },
+    { "path": "packages/harmony-core" }
   ]
 }