Merge pull request #2993 from OriginTrail/fix/proximityScoreFunctions…

…PairId-is-0 Backwards compatibility fix for proximity score function pair id
OriginTrail · Feb 14, 2024 · ef269c8 · ef269c8
2 parents 4cb3749 + e0ba273
commit ef269c8
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 52 deletions.
diff --git a/src/commands/protocols/common/find-nodes-command.js b/src/commands/protocols/common/find-nodes-command.js
@@ -22,8 +22,8 @@ class FindNodesCommand extends Command {
             networkProtocols,
             hashFunctionId,
             minAckResponses,
-            proximityScoreFunctionsPairId,
         } = command.data;
+        const proximityScoreFunctionsPairId = command.data.proximityScoreFunctionsPairId ?? 1;
 
         this.errorType = errorType;
         this.logger.debug(

diff --git a/src/commands/protocols/common/protocol-init-command.js b/src/commands/protocols/common/protocol-init-command.js
@@ -3,14 +3,8 @@ import { NETWORK_MESSAGE_TYPES } from '../../../constants/constants.js';
 
 class ProtocolInitCommand extends ProtocolMessageCommand {
     async prepareMessage(command) {
-        const {
-            assertionId,
-            contract,
-            tokenId,
-            keyword,
-            hashFunctionId,
-            proximityScoreFunctionsPairId,
-        } = command.data;
+        const { assertionId, contract, tokenId, keyword, hashFunctionId } = command.data;
+        const proximityScoreFunctionsPairId = command.data.proximityScoreFunctionsPairId ?? 1;
 
         // TODO: Backwards compatibility, send blockchain without chainId
         const blockchain = command.data.blockchain.split(':')[0];

diff --git a/src/commands/protocols/common/protocol-schedule-messages-command.js b/src/commands/protocols/common/protocol-schedule-messages-command.js
@@ -69,14 +69,8 @@ class ProtocolScheduleMessagesCommand extends Command {
     }
 
     getNextCommandData(command) {
-        const {
-            assertionId,
-            blockchain,
-            contract,
-            tokenId,
-            hashFunctionId,
-            proximityScoreFunctionsPairId,
-        } = command.data;
+        const { assertionId, blockchain, contract, tokenId, hashFunctionId } = command.data;
+        const proximityScoreFunctionsPairId = command.data.proximityScoreFunctionsPairId ?? 1;
         return {
             assertionId,
             blockchain,

diff --git a/src/commands/protocols/get/sender/v1.0.0/v1-0-0-get-init-command.js b/src/commands/protocols/get/sender/v1.0.0/v1-0-0-get-init-command.js
@@ -10,9 +10,8 @@ class GetInitCommand extends ProtocolInitCommand {
     }
 
     async prepareMessage(command) {
-        const { contract, tokenId, keyword, assertionId, state, proximityScoreFunctionsPairId } =
-            command.data;
-
+        const { contract, tokenId, keyword, assertionId, state } = command.data;
+        const proximityScoreFunctionsPairId = command.data.proximityScoreFunctionsPairId ?? 1;
         // TODO: Backwards compatibility, send blockchain without chainId
         const blockchain = command.data.blockchain.split(':')[0];
 

diff --git a/src/commands/protocols/get/sender/v1.0.0/v1-0-0-get-request-command.js b/src/commands/protocols/get/sender/v1.0.0/v1-0-0-get-request-command.js
@@ -31,14 +31,8 @@ class GetRequestCommand extends ProtocolRequestCommand {
     }
 
     async prepareMessage(command) {
-        const {
-            contract,
-            tokenId,
-            assertionId,
-            state,
-            hashFunctionId,
-            proximityScoreFunctionsPairId,
-        } = command.data;
+        const { contract, tokenId, assertionId, state, hashFunctionId } = command.data;
+        const proximityScoreFunctionsPairId = command.data.proximityScoreFunctionsPairId ?? 1;
 
         // TODO: Backwards compatibility, send blockchain without chainId
         const blockchain = command.data.blockchain.split(':')[0];

diff --git a/src/commands/protocols/publish/receiver/v1.0.0/v1-0-0-handle-store-init-command.js b/src/commands/protocols/publish/receiver/v1.0.0/v1-0-0-handle-store-init-command.js
@@ -11,16 +11,9 @@ class HandleStoreInitCommand extends HandleProtocolMessageCommand {
     }
 
     async prepareMessage(commandData) {
-        const {
-            operationId,
-            assertionId,
-            blockchain,
-            contract,
-            tokenId,
-            keyword,
-            hashFunctionId,
-            proximityScoreFunctionsPairId,
-        } = commandData;
+        const { operationId, assertionId, blockchain, contract, tokenId, keyword, hashFunctionId } =
+            commandData;
+        const proximityScoreFunctionsPairId = commandData.proximityScoreFunctionsPairId ?? 1;
 
         await this.operationIdService.updateOperationIdStatus(
             operationId,

diff --git a/src/commands/protocols/update/receiver/v1.0.0/v1-0-0-handle-update-init-command.js b/src/commands/protocols/update/receiver/v1.0.0/v1-0-0-handle-update-init-command.js
@@ -14,16 +14,9 @@ class HandleUpdateInitCommand extends HandleProtocolMessageCommand {
     }
 
     async prepareMessage(commandData) {
-        const {
-            operationId,
-            assertionId,
-            blockchain,
-            contract,
-            tokenId,
-            keyword,
-            hashFunctionId,
-            proximityScoreFunctionsPairId,
-        } = commandData;
+        const { operationId, assertionId, blockchain, contract, tokenId, keyword, hashFunctionId } =
+            commandData;
+        const proximityScoreFunctionsPairId = commandData.proximityScoreFunctionsPairId ?? 1;
         await this.operationIdService.updateOperationIdStatus(
             operationId,
             blockchain,

diff --git a/src/commands/protocols/update/receiver/v1.0.0/v1-0-0-handle-update-request-command.js b/src/commands/protocols/update/receiver/v1.0.0/v1-0-0-handle-update-request-command.js
@@ -37,10 +37,11 @@ class HandleUpdateRequestCommand extends HandleProtocolMessageCommand {
             agreementId,
             keyword,
             hashFunctionId,
-            proximityScoreFunctionsPairId,
             agreementData,
         } = commandData;
 
+        const proximityScoreFunctionsPairId = commandData.proximityScoreFunctionsPairId ?? 1;
+
         await this.operationIdService.updateOperationIdStatus(
             operationId,
             blockchain,

diff --git a/src/controllers/rpc/publish-rpc-controller.js b/src/controllers/rpc/publish-rpc-controller.js
@@ -54,7 +54,7 @@ class PublishController extends BaseController {
             tokenId: dataSource.tokenId,
             keyword: dataSource.keyword,
             hashFunctionId: message.data.hashFunctionId ?? CONTENT_ASSET_HASH_FUNCTION_ID,
-            proximityScoreFunctionsPairId: dataSource.proximityScoreFunctionsPairId,
+            proximityScoreFunctionsPairId: dataSource.proximityScoreFunctionsPairId ?? 1,
         };
 
         await this.commandExecutor.add(command);

diff --git a/src/controllers/rpc/update-rpc-controller.js b/src/controllers/rpc/update-rpc-controller.js
@@ -25,7 +25,7 @@ class UpdateController extends BaseController {
                 command.period = 5000;
                 command.retries = 3;
                 command.data.proximityScoreFunctionsPairId =
-                    dataSource.proximityScoreFunctionsPairId;
+                    dataSource.proximityScoreFunctionsPairId ?? 1;
                 break;
             case NETWORK_MESSAGE_TYPES.REQUESTS.PROTOCOL_REQUEST:
                 // eslint-disable-next-line no-case-declarations
@@ -39,7 +39,7 @@ class UpdateController extends BaseController {
                 command.data.agreementId = dataSource.agreementId;
                 command.data.agreementData = dataSource.agreementData;
                 command.data.proximityScoreFunctionsPairId =
-                    dataSource.agreementData.scoreFunctionId;
+                    dataSource.agreementData.scoreFunctionId ?? 1;
                 break;
             default:
                 throw Error('unknown message type');