Fix from review

massalabs · Aug 23, 2024 · aa7d253 · aa7d253
1 parent a7525df
commit aa7d253
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 13 deletions.
diff --git a/src/utils/formatObjects/nodeStatusInfo.ts → src/client/formatObjects.ts b/src/utils/formatObjects/nodeStatusInfo.ts → src/client/formatObjects.ts
@@ -1,5 +1,5 @@
-import { NodeStatus } from 'src/generated/client'
-import { NodeStatusInfo } from 'src/provider'
+import { NodeStatus } from '../generated/client'
+import { NodeStatusInfo } from '../provider'
 
 export function formatNodeStatusObject(status: NodeStatus): NodeStatusInfo {
   return {

diff --git a/src/provider/interface.ts b/src/provider/interface.ts
@@ -39,5 +39,5 @@ export type Provider = {
   deploySC(params: DeploySCParams): Promise<SmartContract>
   getOperationStatus(opId: string): Promise<OperationStatus>
   getEvents(filter: EventFilter): Promise<SCEvent[]>
-  getStatus(): Promise<NodeStatusInfo>
+  getNodeStatus(): Promise<NodeStatusInfo>
 }
diff --git a/src/provider/web3Provider/web3Provider.ts b/src/provider/web3Provider/web3Provider.ts
@@ -32,7 +32,7 @@ import {
   getAbsoluteExpirePeriod,
   OperationManager,
 } from '../../operation/operationManager'
-import { formatNodeStatusObject } from '../../utils/formatObjects/nodeStatusInfo'
+import { formatNodeStatusObject } from '../../client/formatObjects'
 
 export class Web3Provider extends SCProvider implements Provider {
   static fromRPCUrl(url: string, account: Account): Web3Provider {
@@ -206,7 +206,7 @@ export class Web3Provider extends SCProvider implements Provider {
     return this.client.getEvents(filter)
   }
 
-  public async getStatus(): Promise<NodeStatusInfo> {
+  public async getNodeStatus(): Promise<NodeStatusInfo> {
     const status = await this.client.status()
     return formatNodeStatusObject(status)
   }

diff --git a/src/utils/formatObjects/index.ts b/src/utils/formatObjects/index.ts
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -2,4 +2,3 @@ export * from './isNode'
 export * from './networks'
 export * from './events'
 export * from './maths'
-export * from './formatObjects'
diff --git a/test/integration/MRC20.spec.ts b/test/integration/MRC20.spec.ts
@@ -59,10 +59,7 @@ describe('Token wrapper tests', () => {
     const amount = 123_000_000n
     let operation = await usdcContract.increaseAllowance(
       'AU1wN8rn4SkwYSTDF3dHFY4U28KtsqKL1NnEjDZhHnHEy6cEQm53',
-      amount,
-      {
-        coins: Mas.fromString('0.1'),
-      }
+      amount
     )
     await operation.waitSpeculativeExecution()
 

diff --git a/test/integration/events.spec.ts b/test/integration/events.spec.ts
@@ -42,7 +42,7 @@ describe('SC Event tests', () => {
 
   test('poll transfer event from operationId', async () => {
     const amount = 1_000n
-    const { lastSlot: currentSlot } = await provider.getStatus()
+    const { lastSlot: currentSlot } = await provider.getNodeStatus()
 
     const operation = await usdcContract.transfer(
       'AU1wN8rn4SkwYSTDF3dHFY4U28KtsqKL1NnEjDZhHnHEy6cEQm53',

diff --git a/test/integration/provider.spec.ts b/test/integration/provider.spec.ts
@@ -13,7 +13,7 @@ describe('Provider tests', () => {
   })
 
   test('Node Status', async () => {
-    const status = await provider.getStatus()
+    const status = await provider.getNodeStatus()
     expect(status.config).toBeDefined()
     expect(status.connectedNodes).toBeDefined()
     expect(status.consensusStats).toBeDefined()