Fix c cyrillic letter

config/service.report.json.example

@@ -15,7 +15,7 @@
   },
   "isSpamRestrictionMode": true,
   "isAddedUniqueEndingToReportFileName": true,
-  "isСompress": true,
+  "isCompress": true,
   "isLoggerDisabled": false,
   "dbDriver": "better-sqlite",
   "verboseSql": false,

test/test-cases/api-sync-mode-sqlite-test-cases.js

@@ -910,15 +910,15 @@ module.exports = (
     assert.propertyVal(res.body.result[0], 'start', start)
   })
 
-  it('it should be successfully performed by the editAllPublicСollsСonfs method', async function () {
+  it('it should be successfully performed by the editAllPublicCollsConfs method', async function () {
     this.timeout(5000)
 
     const res = await agent
       .post(`${basePath}/json-rpc`)
       .type('json')
       .send({
         auth,
-        method: 'editAllPublicСollsСonfs',
+        method: 'editAllPublicCollsConfs',
         params: {
           publicTradesConf: [
             {
@@ -967,15 +967,15 @@ module.exports = (
 
   getSyncProgressTestCase(agent, { basePath, auth })
 
-  it('it should be successfully performed by the getAllPublicСollsСonfs method', async function () {
+  it('it should be successfully performed by the getAllPublicCollsConfs method', async function () {
     this.timeout(5000)
 
     const res = await agent
       .post(`${basePath}/json-rpc`)
       .type('json')
       .send({
         auth,
-        method: 'getAllPublicСollsСonfs',
+        method: 'getAllPublicCollsConfs',
         id: 5
       })
       .expect('Content-Type', /json/)

workers/loc.api/di/app.deps.js

@@ -73,7 +73,7 @@ const RecalcSubAccountLedgersBalancesHook = require(
 )
 const BetterSqliteDAO = require('../sync/dao/dao.better.sqlite')
 const {
-  PublicСollsСonfAccessors
+  PublicCollsConfAccessors
 } = require('../sync/colls.accessors')
 const Movements = require('../sync/movements')
 const WinLossVSAccountBalance = require('../sync/win.loss.vs.account.balance')
@@ -143,7 +143,7 @@ module.exports = ({
           ['_progress', TYPES.Progress],
           ['_syncSchema', TYPES.SyncSchema],
           ['_dao', TYPES.DAO],
-          ['_publicСollsСonfAccessors', TYPES.PublicСollsСonfAccessors],
+          ['_publicCollsConfAccessors', TYPES.PublicCollsConfAccessors],
           ['_wallets', TYPES.Wallets],
           ['_balanceHistory', TYPES.BalanceHistory],
           ['_winLoss', TYPES.WinLoss],
@@ -216,8 +216,8 @@ module.exports = ({
     bind(TYPES.WSEventEmitter)
       .to(WSEventEmitter)
       .inSingletonScope()
-    bind(TYPES.PublicСollsСonfAccessors)
-      .to(PublicСollsСonfAccessors)
+    bind(TYPES.PublicCollsConfAccessors)
+      .to(PublicCollsConfAccessors)
       .inSingletonScope()
     bind(TYPES.Progress)
       .to(Progress)

workers/loc.api/di/types.js

@@ -28,7 +28,7 @@ module.exports = {
   DB: Symbol.for('DB'),
   DAO: Symbol.for('DAO'),
   BetterSqliteDAO: Symbol.for('BetterSqliteDAO'),
-  PublicСollsСonfAccessors: Symbol.for('PublicСollsСonfAccessors'),
+  PublicCollsConfAccessors: Symbol.for('PublicCollsConfAccessors'),
   SearchClosePriceAndSumAmount: Symbol.for('SearchClosePriceAndSumAmount'),
   Wallets: Symbol.for('Wallets'),
   BalanceHistory: Symbol.for('BalanceHistory'),

workers/loc.api/helpers/schema.js

@@ -60,7 +60,7 @@ const paramsSchemaForCandlesApi = {
   }
 }
 
-const paramsSchemaForEditAllPublicСollsСonfs = {
+const paramsSchemaForEditAllPublicCollsConfs = {
   type: 'object',
   properties: {
     candlesConf: {
@@ -111,7 +111,7 @@ const paramsSchemaForEditAllPublicСollsСonfs = {
   }
 }
 
-const paramsSchemaForEditPublicСollsСonf = {
+const paramsSchemaForEditPublicCollsConf = {
   type: ['array', 'object'],
   if: {
     type: 'array'
@@ -136,7 +136,7 @@ const paramsSchemaForEditPublicСollsСonf = {
   }
 }
 
-const paramsSchemaForEditCandlesСonf = {
+const paramsSchemaForEditCandlesConf = {
   type: ['array', 'object'],
   if: {
     type: 'array'
@@ -449,9 +449,9 @@ const paramsSchemaForCandlesFile = {
 }
 
 module.exports = {
-  paramsSchemaForEditAllPublicСollsСonfs,
-  paramsSchemaForEditPublicСollsСonf,
-  paramsSchemaForEditCandlesСonf,
+  paramsSchemaForEditAllPublicCollsConfs,
+  paramsSchemaForEditPublicCollsConf,
+  paramsSchemaForEditCandlesConf,
   paramsSchemaForCreateSubAccount,
   paramsSchemaForUpdateSubAccount,
   paramsSchemaForBalanceHistoryApi,

workers/loc.api/service.report.framework.js

@@ -465,38 +465,38 @@ class FrameworkReportService extends ReportService {
 
   getPublicTradesConf (space, args = {}, cb) {
     return this._privResponder(() => {
-      return this._publicСollsСonfAccessors
-        .getPublicСollsСonf('publicTradesConf', args)
+      return this._publicCollsConfAccessors
+        .getPublicCollsConf('publicTradesConf', args)
     }, 'getPublicTradesConf', args, cb)
   }
 
   getTickersHistoryConf (space, args = {}, cb) {
     return this._privResponder(() => {
-      return this._publicСollsСonfAccessors
-        .getPublicСollsСonf('tickersHistoryConf', args)
+      return this._publicCollsConfAccessors
+        .getPublicCollsConf('tickersHistoryConf', args)
     }, 'getTickersHistoryConf', args, cb)
   }
 
   getStatusMessagesConf (space, args = {}, cb) {
     return this._privResponder(() => {
-      return this._publicСollsСonfAccessors
-        .getPublicСollsСonf('statusMessagesConf', args)
+      return this._publicCollsConfAccessors
+        .getPublicCollsConf('statusMessagesConf', args)
     }, 'getStatusMessagesConf', args, cb)
   }
 
   getCandlesConf (space, args = {}, cb) {
     return this._privResponder(() => {
-      return this._publicСollsСonfAccessors
-        .getPublicСollsСonf('candlesConf', args)
+      return this._publicCollsConfAccessors
+        .getPublicCollsConf('candlesConf', args)
     }, 'getCandlesConf', args, cb)
   }
 
   editPublicTradesConf (space, args = {}, cb) {
     return this._privResponder(async () => {
-      checkParams(args, 'paramsSchemaForEditPublicСollsСonf')
+      checkParams(args, 'paramsSchemaForEditPublicCollsConf')
 
-      await this._publicСollsСonfAccessors
-        .editPublicСollsСonf('publicTradesConf', args)
+      await this._publicCollsConfAccessors
+        .editPublicCollsConf('publicTradesConf', args)
 
       if (isNotSyncRequired(args)) {
         return true
@@ -514,10 +514,10 @@ class FrameworkReportService extends ReportService {
 
   editTickersHistoryConf (space, args = {}, cb) {
     return this._privResponder(async () => {
-      checkParams(args, 'paramsSchemaForEditPublicСollsСonf')
+      checkParams(args, 'paramsSchemaForEditPublicCollsConf')
 
-      await this._publicСollsСonfAccessors
-        .editPublicСollsСonf('tickersHistoryConf', args)
+      await this._publicCollsConfAccessors
+        .editPublicCollsConf('tickersHistoryConf', args)
 
       if (isNotSyncRequired(args)) {
         return true
@@ -535,10 +535,10 @@ class FrameworkReportService extends ReportService {
 
   editStatusMessagesConf (space, args = {}, cb) {
     return this._privResponder(async () => {
-      checkParams(args, 'paramsSchemaForEditPublicСollsСonf')
+      checkParams(args, 'paramsSchemaForEditPublicCollsConf')
 
-      await this._publicСollsСonfAccessors
-        .editPublicСollsСonf('statusMessagesConf', args)
+      await this._publicCollsConfAccessors
+        .editPublicCollsConf('statusMessagesConf', args)
 
       if (isNotSyncRequired(args)) {
         return true
@@ -556,10 +556,10 @@ class FrameworkReportService extends ReportService {
 
   editCandlesConf (space, args = {}, cb) {
     return this._privResponder(async () => {
-      checkParams(args, 'paramsSchemaForEditCandlesСonf')
+      checkParams(args, 'paramsSchemaForEditCandlesConf')
 
-      await this._publicСollsСonfAccessors
-        .editPublicСollsСonf('candlesConf', args)
+      await this._publicCollsConfAccessors
+        .editPublicCollsConf('candlesConf', args)
 
       if (isNotSyncRequired(args)) {
         return true
@@ -575,12 +575,12 @@ class FrameworkReportService extends ReportService {
     }, 'editCandlesConf', args, cb)
   }
 
-  editAllPublicСollsСonfs (space, args = {}, cb) {
+  editAllPublicCollsConfs (space, args = {}, cb) {
     return this._privResponder(async () => {
-      checkParams(args, 'paramsSchemaForEditAllPublicСollsСonfs')
+      checkParams(args, 'paramsSchemaForEditAllPublicCollsConfs')
 
-      const syncedColls = await this._publicСollsСonfAccessors
-        .editAllPublicСollsСonfs(args)
+      const syncedColls = await this._publicCollsConfAccessors
+        .editAllPublicCollsConfs(args)
 
       if (isNotSyncRequired(args)) {
         return true
@@ -596,10 +596,10 @@ class FrameworkReportService extends ReportService {
     }, 'editCandlesConf', args, cb)
   }
 
-  getAllPublicСollsСonfs (space, args = {}, cb) {
+  getAllPublicCollsConfs (space, args = {}, cb) {
     return this._privResponder(() => {
-      return this._publicСollsСonfAccessors
-        .getAllPublicСollsСonfs(args)
+      return this._publicCollsConfAccessors
+        .getAllPublicCollsConfs(args)
     }, 'editCandlesConf', args, cb)
   }
 
@@ -879,7 +879,7 @@ class FrameworkReportService extends ReportService {
 
       checkParams(args, 'paramsSchemaForApi', ['symbol'])
 
-      return this._publicСollsСonfAccessors
+      return this._publicCollsConfAccessors
         .getPublicData(
           (args) => super.getTickersHistory(space, args),
           args,
@@ -903,7 +903,7 @@ class FrameworkReportService extends ReportService {
 
       checkParams(args, 'paramsSchemaForPublicTrades', ['symbol'])
 
-      return this._publicСollsСonfAccessors
+      return this._publicCollsConfAccessors
         .getPublicData(
           (args) => super.getPublicTrades(space, args),
           args,
@@ -949,7 +949,7 @@ class FrameworkReportService extends ReportService {
         }
       }
 
-      return this._publicСollsСonfAccessors
+      return this._publicCollsConfAccessors
         .getPublicData(
           (args) => super.getStatusMessages(space, args),
           preparedArgs,
@@ -987,7 +987,7 @@ class FrameworkReportService extends ReportService {
         }
       }
 
-      return this._publicСollsСonfAccessors
+      return this._publicCollsConfAccessors
         .getPublicData(
           (args) => super.getCandles(space, args),
           argsWithParamsByDefault,

workers/loc.api/sync/colls.accessors/index.js

@@ -1,9 +1,9 @@
 'use strict'
 
-const PublicСollsСonfAccessors = require(
+const PublicCollsConfAccessors = require(
   './public.colls.conf.accessors'
 )
 
 module.exports = {
-  PublicСollsСonfAccessors
+  PublicCollsConfAccessors
 }

workers/loc.api/sync/colls.accessors/public.colls.conf.accessors.js

@@ -26,7 +26,7 @@ const depsTypes = (TYPES) => [
   TYPES.TABLES_NAMES,
   TYPES.Authenticator
 ]
-class PublicСollsСonfAccessors {
+class PublicCollsConfAccessors {
   constructor (
     dao,
     TABLES_NAMES,
@@ -68,7 +68,7 @@ class PublicСollsСonfAccessors {
     ))
   }
 
-  async editAllPublicСollsСonfs (args) {
+  async editAllPublicCollsConfs (args) {
     const { params } = { ...args }
     const _params = pick(
       params,
@@ -83,7 +83,7 @@ class PublicСollsСonfAccessors {
         params
       }
 
-      await this.editPublicСollsСonf(confName, _args)
+      await this.editPublicCollsConf(confName, _args)
 
       const syncedColl = this.confNamesMap.get(confName)
 
@@ -95,7 +95,7 @@ class PublicСollsСonfAccessors {
     return syncedColls
   }
 
-  async editPublicСollsСonf (confName, args) {
+  async editPublicCollsConf (confName, args) {
     const data = Array.isArray(args.params)
       ? [...args.params]
       : [args.params]
@@ -185,20 +185,20 @@ class PublicСollsСonfAccessors {
     )
   }
 
-  async getAllPublicСollsСonfs (args) {
+  async getAllPublicCollsConfs (args) {
     await this.authenticator.verifyRequestUser(args)
 
     const confNames = [...this.confNamesMap.keys()]
     const res = {}
 
     for (const confName of confNames) {
-      res[confName] = await this.getPublicСollsСonf(confName, args)
+      res[confName] = await this.getPublicCollsConf(confName, args)
     }
 
     return res
   }
 
-  async getPublicСollsСonf (confName, args) {
+  async getPublicCollsConf (confName, args) {
     const { _id } = await this.authenticator.verifyRequestUser(args)
     const { params } = { ...args }
     const {
@@ -422,7 +422,7 @@ class PublicСollsСonfAccessors {
       notCheckNextPage
     } = { ...params }
 
-    const confs = await this.getPublicСollsСonf(
+    const confs = await this.getPublicCollsConf(
       confName,
       args
     )
@@ -491,6 +491,6 @@ class PublicСollsСonfAccessors {
   }
 }
 
-decorateInjectable(PublicСollsСonfAccessors, depsTypes)
+decorateInjectable(PublicCollsConfAccessors, depsTypes)
 
-module.exports = PublicСollsСonfAccessors
+module.exports = PublicCollsConfAccessors

workers/loc.api/sync/data.inserter/data.checker/index.js

@@ -237,7 +237,7 @@ class DataChecker {
       ? ['symbol', 'timeframe']
       : ['symbol']
 
-    const publicСollsСonf = await this.dao.getElemsInCollBy(
+    const publicCollsConf = await this.dao.getElemsInCollBy(
       this.TABLES_NAMES.PUBLIC_COLLS_CONF,
       {
         filter: { confName },
@@ -247,11 +247,11 @@ class DataChecker {
       }
     )
 
-    if (isEmpty(publicСollsСonf)) {
+    if (isEmpty(publicCollsConf)) {
       return
     }
 
-    for (const confs of publicСollsСonf) {
+    for (const confs of publicCollsConf) {
       if (this._isInterrupted) {
         return
       }