feat: renames and refactors

rsksmart · Jul 27, 2020 · 1f36b7c · 1f36b7c
1 parent a1b3ea5
commit 1f36b7c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/src/definitions.ts b/src/definitions.ts
@@ -6,7 +6,7 @@ import { Eth } from 'web3-eth'
 
 import type { AgreementService, OfferService } from './services/storage'
 import type { RatesService } from './services/rates'
-import type { RnsService } from './services/rns'
+import type { RnsBaseService } from './services/rns'
 import { ConfirmatorService } from './blockchain/confirmator'
 
 export enum SupportedServices {
@@ -34,9 +34,9 @@ interface ServiceTypes {
   [ServiceAddresses.STORAGE_OFFERS]: OfferService & ServiceAddons<any>
   [ServiceAddresses.STORAGE_AGREEMENTS]: AgreementService & ServiceAddons<any>
   [ServiceAddresses.XR]: RatesService & ServiceAddons<any>
-  [ServiceAddresses.RNS_DOMAINS]: RnsService & ServiceAddons<any>
-  [ServiceAddresses.RNS_SOLD]: RnsService & ServiceAddons<any>
-  [ServiceAddresses.RNS_OFFERS]: RnsService & ServiceAddons<any>
+  [ServiceAddresses.RNS_DOMAINS]: RnsBaseService & ServiceAddons<any>
+  [ServiceAddresses.RNS_SOLD]: RnsBaseService & ServiceAddons<any>
+  [ServiceAddresses.RNS_OFFERS]: RnsBaseService & ServiceAddons<any>
   [ServiceAddresses.CONFIRMATIONS]: ConfirmatorService & ServiceAddons<any>
 }
 

diff --git a/src/services/rns/index.ts b/src/services/rns/index.ts
@@ -27,13 +27,13 @@ import eventProcessor from './rns.processor'
 
 const logger = loggingFactory('rns')
 
-export class RnsService extends Service {
+export class RnsBaseService extends Service {
   emit?: Function
 }
 export interface RnsServices {
-  domains: RnsService & { emit?: Function }
-  sold: RnsService & { emit?: Function }
-  offers: RnsService & { emit?: Function }
+  domains: RnsBaseService & { emit?: Function }
+  sold: RnsBaseService & { emit?: Function }
+  offers: RnsBaseService & { emit?: Function }
 }
 
 function fetchEventsForService (eth: Eth, serviceName: string, abi: AbiItem[], dataPusher: (event: EventData) => void): Promise<void> {
@@ -76,9 +76,9 @@ async function precache (eth?: Eth): Promise<void> {
   })
 
   const sequelizeServices = {
-    domains: new RnsService({ Model: Domain }),
-    sold: new RnsService({ Model: SoldDomain }),
-    offers: new RnsService({ Model: DomainOffer, multi: true })
+    domains: new RnsBaseService({ Model: Domain }),
+    sold: new RnsBaseService({ Model: SoldDomain }),
+    offers: new RnsBaseService({ Model: DomainOffer, multi: true })
   }
 
   for (const event of eventsDataQueue) {
@@ -98,9 +98,9 @@ const rns: CachedService = {
     await waitForReadyApp(app)
 
     // Initialize feather's service
-    app.use(ServiceAddresses.RNS_DOMAINS, new RnsService({ Model: Domain }))
-    app.use(ServiceAddresses.RNS_SOLD, new RnsService({ Model: SoldDomain }))
-    app.use(ServiceAddresses.RNS_OFFERS, new RnsService({ Model: DomainOffer }))
+    app.use(ServiceAddresses.RNS_DOMAINS, new RnsBaseService({ Model: Domain }))
+    app.use(ServiceAddresses.RNS_SOLD, new RnsBaseService({ Model: SoldDomain }))
+    app.use(ServiceAddresses.RNS_OFFERS, new RnsBaseService({ Model: DomainOffer }))
 
     const domains = app.service(ServiceAddresses.RNS_DOMAINS)
     const sold = app.service(ServiceAddresses.RNS_SOLD)

diff --git a/src/services/rns/rns.processor.ts b/src/services/rns/rns.processor.ts
@@ -3,7 +3,7 @@ import config from 'config'
 import { Eth } from 'web3-eth'
 import { EventData } from 'web3-eth-contract'
 import Utils from 'web3-utils'
-import { RnsService, RnsServices } from '.'
+import { RnsBaseService, RnsServices } from '.'
 import { getBlockDate } from '../../blockchain/utils'
 import { Logger } from '../../definitions'
 import DomainOffer from './models/domain-offer.model'
@@ -13,8 +13,10 @@ import DomainOwner from './models/owner.model'
 import Transfer from './models/transfer.model'
 import SoldDomain from './models/sold-domain.model'
 
-// registerTransfer: creates the transfer record and updates DomainOwner
-async function registerTransfer (transactionHash: string, tokenId: string, sellerAddress: string, buyerAddress: string, logger: Logger, domainsService: RnsService) {
+/**
+ * Creates the transfer record and updates DomainOwner
+ */
+async function registerTransfer (transactionHash: string, tokenId: string, sellerAddress: string, buyerAddress: string, logger: Logger, domainsService: RnsBaseService) {
   const transferDomain = await Transfer.create({
     id: transactionHash,
     tokenId,
@@ -52,7 +54,7 @@ async function transferHandler (logger: Logger, eventData: EventData, eth: Eth,
 
   const fiftsAddr = config.get('rns.fifsAddrRegistrar.contractAddress')
   const registrar = config.get('rns.registrar.contractAddress')
-  const marketplace = config.get('rns.placement.contractAddress')
+  const marketplace = config.get<string>('rns.placement.contractAddress')
   const tld = config.get('rns.tld')
 
   const transactionHash = eventData.transactionHash
@@ -90,7 +92,7 @@ async function transferHandler (logger: Logger, eventData: EventData, eth: Eth,
     return
   }
 
-  if (ownerAddress === (marketplace as string).toLowerCase() || from === (marketplace as string).toLowerCase()) {
+  if (ownerAddress === marketplace.toLowerCase() || from === marketplace.toLowerCase()) {
     return // Marketplace transfers are handled in TokenSold
   }