Proof of concept: Use empty optionals

dfinity · Mar 6, 2024 · 4cc3d05 · 4cc3d05
1 parent defe796
commit 4cc3d05
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 71 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -71,12 +71,12 @@
     "@dfinity/ic-management": "next",
     "@dfinity/identity": "^1.0.1",
     "@dfinity/ledger-icp": "next",
-    "@dfinity/ledger-icrc": "next",
-    "@dfinity/nns": "next",
+    "@dfinity/ledger-icrc": "file:../../../ic-js/tree1/packages/ledger-icrc",
+    "@dfinity/nns": "file:../../../ic-js/tree1/packages/nns",
     "@dfinity/nns-proto": "next",
     "@dfinity/principal": "^1.0.1",
-    "@dfinity/sns": "next",
-    "@dfinity/utils": "next",
+    "@dfinity/sns": "file:../../../ic-js/tree1/packages/sns",
+    "@dfinity/utils": "file:../../../ic-js/tree1/packages/utils",
     "@ledgerhq/hw-transport-node-hid-noevents": "^6.27.8",
     "@ledgerhq/hw-transport-webhid": "^6.27.8",
     "@zondax/ledger-icp": "^0.6.1",

diff --git a/frontend/src/lib/utils/sns-aggregator-converters.utils.ts b/frontend/src/lib/utils/sns-aggregator-converters.utils.ts
@@ -32,6 +32,7 @@ import type {
   SnsSwapDerivedState,
   SnsSwapInit,
 } from "@dfinity/sns";
+import { emptyOptionalsForSnsNeuronsFundParticipationConstraints } from "@dfinity/sns";
 import { isNullish, nonNullish, toNullable } from "@dfinity/utils";
 import { mapOptionalToken } from "./icrc-tokens.utils";
 import { isPngAsset } from "./utils";
@@ -93,6 +94,7 @@ export const convertNervousFunction = ({
 const convertNeuronsFundParticipationConstraints = (
   constraints: CachedNeuronsFundParticipationConstraints
 ): SnsNeuronsFundParticipationConstraints => ({
+  ...emptyOptionalsForSnsNeuronsFundParticipationConstraints,
   coefficient_intervals: constraints.coefficient_intervals.map(
     ({
       slope_numerator,
@@ -126,7 +128,6 @@ const convertNeuronsFundParticipationConstraints = (
       constraints.min_direct_participation_threshold_icp_e8s
     )
   ),
-  ideal_matched_participation_function: [],
 });
 
 const convertSwapInitParams = (

diff --git a/frontend/src/tests/lib/utils/sns-aggregator-converters.utils.spec.ts b/frontend/src/tests/lib/utils/sns-aggregator-converters.utils.spec.ts
@@ -7,6 +7,7 @@ import {
 } from "$lib/utils/sns-aggregator-converters.utils";
 import { aggregatorSnsMockDto } from "$tests/mocks/sns-aggregator.mock";
 import { Principal } from "@dfinity/principal";
+import { emptyOptionalsForSnsNeuronsFundParticipationConstraints } from "@dfinity/sns";
 
 describe("sns aggregator converters utils", () => {
   describe("convertDtoData", () => {
@@ -563,6 +564,7 @@ describe("sns aggregator converters utils", () => {
                 ...summaryMockData.swap.init[0],
                 neurons_fund_participation_constraints: [
                   {
+                    ...emptyOptionalsForSnsNeuronsFundParticipationConstraints,
                     coefficient_intervals: [
                       {
                         slope_numerator: [2n],
@@ -574,7 +576,6 @@ describe("sns aggregator converters utils", () => {
                     ],
                     max_neurons_fund_participation_icp_e8s: [300000000000n],
                     min_direct_participation_threshold_icp_e8s: [10000000000n],
-                    ideal_matched_participation_function: [],
                   },
                 ],
                 min_direct_participation_icp_e8s: [300000000000n],

diff --git a/frontend/src/tests/mocks/sns-projects.mock.ts b/frontend/src/tests/mocks/sns-projects.mock.ts
@@ -15,6 +15,7 @@ import {
 import { Principal } from "@dfinity/principal";
 import {
   SnsSwapLifecycle,
+  emptyOptionalsForSnsNeuronsFundParticipationConstraints,
   type SnsGetDerivedStateResponse,
   type SnsGetLifecycleResponse,
   type SnsGetMetadataResponse,
@@ -394,11 +395,10 @@ export const createSummary = ({
     neurons_fund_participation_constraints: nonNullish(maxNFParticipation)
       ? [
           {
+            ...emptyOptionalsForSnsNeuronsFundParticipationConstraints,
             max_neurons_fund_participation_icp_e8s:
               toNullable(maxNFParticipation),
             coefficient_intervals: [],
-            min_direct_participation_threshold_icp_e8s: [],
-            ideal_matched_participation_function: [],
           },
         ]
       : [],