Merge pull request #733 from oceanprotocol/issue-732-system-test-nonce

fix system tests. Running old version of node?
oceanprotocol · Oct 24, 2024 · 2a62160 · 2a62160
2 parents d114cb9 + 7d47387
commit 2a62160
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - develop
     tags:
       - '**'
   pull_request:
@@ -259,7 +258,7 @@ jobs:
         with:
           repository: 'oceanprotocol/ocean-node'
           path: 'ocean-node'
-          ref: ${{ github.event_name == 'pull_request' && github.head_ref || 'develop' }}
+          ref: ${{ github.event_name == 'pull_request' && github.head_ref || 'main' }}
 
       - name: Start Ocean Node
         working-directory: ${{ github.workspace }}/ocean-node

diff --git a/src/components/database/DatabaseFactory.ts b/src/components/database/DatabaseFactory.ts
@@ -4,7 +4,6 @@ import {
   AbstractDdoStateDatabase,
   AbstractIndexerDatabase,
   AbstractLogDatabase,
-  AbstractNonceDatabase,
   AbstractOrderDatabase
 } from './BaseDatabase.js'
 import {
@@ -35,8 +34,6 @@ import { SQLLiteNonceDatabase } from './SQLLiteNonceDatabase.js'
 export class DatabaseFactory {
   private static databaseMap = {
     elasticsearch: {
-      nonce: (config: OceanNodeDBConfig) =>
-        new SQLLiteNonceDatabase(config, typesenseSchemas.nonceSchemas),
       ddo: (config: OceanNodeDBConfig) =>
         new ElasticsearchDdoDatabase(config, elasticSchemas.ddoSchemas),
       indexer: (config: OceanNodeDBConfig) => new ElasticsearchIndexerDatabase(config),
@@ -48,8 +45,6 @@ export class DatabaseFactory {
       metadataQuery: () => new ElasticSearchMetadataQuery()
     },
     typesense: {
-      nonce: (config: OceanNodeDBConfig) =>
-        new SQLLiteNonceDatabase(config, typesenseSchemas.nonceSchemas),
       ddo: (config: OceanNodeDBConfig) =>
         new TypesenseDdoDatabase(config, typesenseSchemas.ddoSchemas),
       indexer: (config: OceanNodeDBConfig) =>
@@ -80,8 +75,10 @@ export class DatabaseFactory {
     return databaseCreator(config) as T
   }
 
-  static createNonceDatabase(config: OceanNodeDBConfig): Promise<AbstractNonceDatabase> {
-    return this.createDatabase('nonce', config)
+  static async createNonceDatabase(
+    config: OceanNodeDBConfig
+  ): Promise<SQLLiteNonceDatabase> {
+    return await new SQLLiteNonceDatabase(config, typesenseSchemas.nonceSchemas)
   }
 
   static createDdoDatabase(config: OceanNodeDBConfig): Promise<AbstractDdoDatabase> {

diff --git a/src/components/database/SQLLiteNonceDatabase.ts b/src/components/database/SQLLiteNonceDatabase.ts
@@ -13,13 +13,7 @@ export class SQLLiteNonceDatabase extends AbstractNonceDatabase {
   constructor(config: OceanNodeDBConfig, schema: TypesenseSchema) {
     super(config, schema)
     return (async (): Promise<SQLLiteNonceDatabase> => {
-      // Fall back to SQLite
-      DATABASE_LOGGER.logMessageWithEmoji(
-        'Nonce Database initiated with SQLite provider',
-        true,
-        GENERIC_EMOJIS.EMOJI_CROSS_MARK,
-        LOG_LEVELS_STR.LEVEL_WARN
-      )
+      DATABASE_LOGGER.info('Nonce Database initiated with SQLite provider')
 
       // Ensure the directory exists before instantiating SQLiteProvider
       const dbDir = path.dirname('databases/nonceDatabase.sqlite')