rename Providerfees to ProviderFees

Author: alexcos20

src/components/core/compute/initialize.ts

@@ -12,7 +12,7 @@ import {
   isDataTokenTemplate4,
   isERC20Template4Active
 } from '../../../utils/asset.js'
-import { Providerfees } from '../utils/feesHandler.js'
+import { ProviderFees } from '../utils/feesHandler.js'
 
 import { validateOrderTransaction } from '../utils/validateOrders.js'
 import { EncryptMethod } from '../../../@types/fileObject.js'
@@ -532,7 +532,7 @@ export class ComputeInitializeHandler extends CommandHandler {
             message: false
           }
           result.consumerAddress = env.consumerAddress
-          const fees = new Providerfees(node)
+          const fees = new ProviderFees(node)
           if ('transferTxId' in elem && elem.transferTxId) {
             // search for that compute env and see if it has access to dataset
             const paymentValidation = await validateOrderTransaction(

src/components/core/handler/downloadHandler.ts

@@ -1,7 +1,7 @@
 import { CommandHandler } from './handler.js'
 import { MetadataStates, PROTOCOL_COMMANDS } from '../../../utils/constants.js'
 import { P2PCommandResponse } from '../../../@types/OceanNode.js'
-import { Providerfees } from '../utils/feesHandler.js'
+import { ProviderFees } from '../utils/feesHandler.js'
 import { FindDdoHandler } from './ddoHandler.js'
 import crypto from 'crypto'
 import { GENERIC_EMOJIS, LOG_LEVELS_STR } from '../../../utils/logging/Logger.js'
@@ -410,7 +410,7 @@ export class DownloadHandler extends CommandHandler {
       }
     }
     // 5. check that the provider fee transaction is valid
-    const fees = new Providerfees(node)
+    const fees = new ProviderFees(node)
     const validFee = await fees.verifyProviderFees(
       task.transferTxId,
       task.consumerAddress,

src/components/core/handler/feesHandler.ts

@@ -1,7 +1,7 @@
 import { CommandHandler } from './handler.js'
 import { GetFeesCommand } from '../../../@types/commands.js'
 import { P2PCommandResponse } from '../../../@types/OceanNode.js'
-import { Providerfees } from '../utils/feesHandler.js'
+import { ProviderFees } from '../utils/feesHandler.js'
 import { Readable } from 'stream'
 import { GENERIC_EMOJIS, LOG_LEVELS_STR } from '../../../utils/logging/Logger.js'
 import { PROVIDER_LOGGER } from '../../../utils/logging/common.js'
@@ -100,7 +100,7 @@ export class FeesHandler extends CommandHandler {
     const nonceDB = (await this.getOceanNode().getDatabase()).nonce
     const nonceHandlerResponse = await getNonce(nonceDB, task.consumerAddress)
     const nonce = await streamToString(nonceHandlerResponse.stream as Readable)
-    const feesClass = new Providerfees(this.getOceanNode())
+    const feesClass = new ProviderFees(this.getOceanNode())
     try {
       const providerFee = await feesClass.createProviderFee(ddo, service, validUntil)
       if (providerFee) {

src/components/core/utils/feesHandler.ts

@@ -12,7 +12,7 @@ import {
   FeeTokens,
   ProviderFeeData,
   ProviderFeeValidation,
-  ProviderFees
+  ProviderFees as ProviderFeesResult
 } from '../../../@types/Fees'
 import { Service, DDOManager, Asset } from '@oceanprotocol/ddo-js'
 import { getDatatokenDecimals, verifyMessage } from '../../../utils/blockchain.js'
@@ -23,7 +23,7 @@ import ERC20Template from '@oceanprotocol/contracts/artifacts/contracts/template
 import { fetchEventFromTransaction } from '../../../utils/util.js'
 import { fetchTransactionReceipt } from './validateOrders.js'
 
-export class Providerfees {
+export class ProviderFees {
   private node: OceanNode
 
   constructor(_node: OceanNode) {
@@ -58,7 +58,7 @@ export class Providerfees {
     asset: Asset,
     service: Service,
     validUntil: number
-  ): Promise<ProviderFees> | undefined {
+  ): Promise<ProviderFeesResult> | undefined {
     // round for safety
     validUntil = Math.round(validUntil)
 

src/test/integration/indexer.test.ts

@@ -48,7 +48,7 @@ import { QueryCommand } from '../../@types/commands.js'
 import { getConfiguration } from '../../utils/config.js'
 import { EncryptMethod } from '../../@types/fileObject.js'
 import { deleteIndexedMetadataIfExists } from '../../utils/asset.js'
-import { Providerfees } from '../../components/core/utils/feesHandler.js'
+import { ProviderFees } from '../../components/core/utils/feesHandler.js'
 
 describe('**********         Indexer stores a new metadata events and orders.', () => {
   let database: Database
@@ -412,7 +412,7 @@ describe('**********         Indexer stores a new metadata events and orders.',
       paymentCollector?.toLowerCase() === publisherAddress?.toLowerCase(),
       'paymentCollector not correct'
     )
-    const fees = new Providerfees(oceanNode)
+    const fees = new ProviderFees(oceanNode)
     const feeData = await fees.createFee(
       resolvedDDO as DDO,
       0,
@@ -515,7 +515,7 @@ describe('**********         Indexer stores a new metadata events and orders.',
 
   it('should detect OrderReused event', async function () {
     this.timeout(DEFAULT_TEST_TIMEOUT * 2)
-    const fees = new Providerfees(oceanNode)
+    const fees = new ProviderFees(oceanNode)
     const feeData = await fees.createFee(
       resolvedDDO as DDO,
       0,

src/test/integration/operationsDashboard.test.ts

@@ -56,7 +56,7 @@ import { CollectFeesHandler } from '../../components/core/admin/collectFeesHandl
 import { KeyManager } from '../../components/KeyManager/index.js'
 import { BlockchainRegistry } from '../../components/BlockchainRegistry/index.js'
 import { createHashForSignature, safeSign } from '../utils/signature.js'
-import { Providerfees } from '../../components/core/utils/feesHandler.js'
+import { ProviderFees } from '../../components/core/utils/feesHandler.js'
 
 describe('**********         OperationsDashboard tests', () => {
   let config: OceanNodeConfig
@@ -155,7 +155,7 @@ describe('**********         OperationsDashboard tests', () => {
       PROTOCOL_COMMANDS.COLLECT_FEES
     )
     let signature = await safeSign(adminWallet, messageHashBytes)
-    const fees = new Providerfees(oceanNode)
+    const fees = new ProviderFees(oceanNode)
     const collectFeesCommand: AdminCollectFeesCommand = {
       command: PROTOCOL_COMMANDS.COLLECT_FEES,
       tokenAddress: fees.getProviderFeeToken(DEVELOPMENT_CHAIN_ID),