From ed8eef68d8abc866a6cfe77e7e60767818355e87 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Tue, 14 Jul 2020 03:19:16 -0700
Subject: [PATCH] resolve comments

---
 src/datatokens/Datatokens.ts | 15 ++++-----------
 src/ocean/Assets.ts          |  4 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/datatokens/Datatokens.ts b/src/datatokens/Datatokens.ts
index 7ac01600..0ec7ff73 100644
--- a/src/datatokens/Datatokens.ts
+++ b/src/datatokens/Datatokens.ts
@@ -159,15 +159,8 @@ export class DataTokens {
         amount: number,
         account: Account
     ): Promise<string> {
-        const datatoken = new this.web3.eth.Contract(
-            this.datatokensABI,
-            dataTokenAddress,
-            { from: account }
-        )
-        const trxReceipt = await datatoken.methods
-            .transfer(toAddress, this.web3.utils.toWei(String(amount)))
-            .send()
-        return trxReceipt
+        const weiAmount = this.web3.utils.toWei(String(amount))
+        return this.transferWei(dataTokenAddress, toAddress, weiAmount, account)
     }
 
     /**
@@ -232,8 +225,8 @@ export class DataTokens {
             dataTokenAddress,
             { from: account }
         )
-        const trxReceipt = await datatoken.methods.balanceOf(account).call()
-        return this.web3.utils.fromWei(trxReceipt)
+        const balance = await datatoken.methods.balanceOf(account).call()
+        return this.web3.utils.fromWei(balance)
     }
 
     /**
diff --git a/src/ocean/Assets.ts b/src/ocean/Assets.ts
index 9a105338..d5fa3244 100644
--- a/src/ocean/Assets.ts
+++ b/src/ocean/Assets.ts
@@ -371,7 +371,7 @@ export class Assets extends Instantiable {
      */
     public async createAccessServiceAttributes(
         creator: Account,
-        dtCost: string,
+        cost: string,
         datePublished: string,
         timeout: number = 0
     ): Promise<ServiceAccess> {
@@ -383,7 +383,7 @@ export class Assets extends Instantiable {
                 main: {
                     creator: creator.getId(),
                     datePublished,
-                    cost: dtCost,
+                    cost,
                     timeout: timeout,
                     name: 'dataAssetAccess'
                 }