Skip to content

fix(core-database): remove delegate registration expression#4781

Merged
sebastijankuzner merged 3 commits intodevelopfrom
fix/core-database/remove-delegate-registration-search
Jul 10, 2023
Merged

fix(core-database): remove delegate registration expression#4781
sebastijankuzner merged 3 commits intodevelopfrom
fix/core-database/remove-delegate-registration-search

Conversation

@sebastijankuzner
Copy link
Contributor

Summary

Remove the delegateRegistrationExpression, because it is unnecessary expression. Generated query is already comparing senderPublicKey.

Expression:

{
    op: "or",
    expressions: [
        { property: "senderPublicKey", op: "equal", value: "456" },
        { property: "recipientId", op: "equal", value: "123" },
        {
            op: "and",
            expressions: [
                { property: "typeGroup", op: "equal", value: Enums.TransactionTypeGroup.Core },
                { property: "type", op: "equal", value: Enums.TransactionType.MultiPayment },
                { property: "asset", op: "contains", value: { payments: [{ recipientId: "123" }] } },
            ],
        },
        {
            op: "and",
            expressions: [
                { property: "typeGroup", op: "equal", value: Enums.TransactionTypeGroup.Core },
                { property: "type", op: "equal", value: Enums.TransactionType.DelegateRegistration },
                { property: "senderPublicKey", op: "equal", value: "456" },
            ],
        },
    ],
}

can be shorten to:

{
    op: "or",
    expressions: [
        { property: "senderPublicKey", op: "equal", value: "456" },
        { property: "recipientId", op: "equal", value: "123" },
        {
            op: "and",
            expressions: [
                { property: "typeGroup", op: "equal", value: Enums.TransactionTypeGroup.Core },
                { property: "type", op: "equal", value: Enums.TransactionType.MultiPayment },
                { property: "asset", op: "contains", value: { payments: [{ recipientId: "123" }] } },
            ],
        },
    ],
}

because we already use:

{ property: "senderPublicKey", op: "equal", value: "456" },

and removed expression can only return the subset of that expressions.

Checklist

  • Tests (if necessary)
  • Ready to be merged

@sebastijankuzner sebastijankuzner changed the title Fix/core database/remove delegate registration search fix(core-database): remove delegate registratio expression Jul 4, 2023
@oXtxNt9U oXtxNt9U changed the title fix(core-database): remove delegate registratio expression fix(core-database): remove delegate registration expression Jul 10, 2023
@sebastijankuzner sebastijankuzner merged commit 9f7f7ad into develop Jul 10, 2023
@sebastijankuzner sebastijankuzner deleted the fix/core-database/remove-delegate-registration-search branch July 10, 2023 11:31
sebastijankuzner added a commit that referenced this pull request Jul 10, 2023
* Remove delegate registration expression

* Fix tests

* Fix integration tests
sebastijankuzner added a commit that referenced this pull request Jul 10, 2023
* fix(core-database): remove delegate registration expression (#4781)

* Remove delegate registration expression

* Fix tests

* Fix integration tests

* deps(p2p): update protobufjs (#4782)

* Update protobufjs

* Add protobufjs-cli

* Generate protos
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants