Manual merge conflict resolution

dfinity · Jul 8, 2024 · d7ba766 · d7ba766
1 parent dc43fb0
commit d7ba766
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/test/run-drun/ok/query-footprint-overflow.drun-run.ok b/test/run-drun/ok/query-footprint-overflow.drun-run.ok
@@ -1,3 +1,3 @@
 ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
 ingress Completed: Reply: 0x4449444c0000
-ingress Completed: Reject: IC0503: Canister rwlgt-iiaaa-aaaaa-aaaaa-cai trapped explicitly: Deprecated with enhanced orthogonal persistence
+ingress Completed: Reject: IC0503: Canister rwlgt-iiaaa-aaaaa-aaaaa-cai trapped explicitly: buffer_size overflow
diff --git a/test/run-drun/ok/query-footprint-overflow.tc.ok b/test/run-drun/ok/query-footprint-overflow.tc.ok
@@ -1 +1 @@
-query-footprint-overflow.mo:21.16-21.20: warning [M0194], unused identifier expl (delete or rename to wildcard `_` or `_expl`)
+query-footprint-overflow.mo:22.16-22.20: warning [M0194], unused identifier expl (delete or rename to wildcard `_` or `_expl`)
diff --git a/test/run-drun/ok/query-footprint.drun-run.ok b/test/run-drun/ok/query-footprint.drun-run.ok
@@ -1,6 +1,6 @@
 ingress Completed: Reply: 0x4449444c016c01b3c4b1f204680100010a00000000000000000101
 ingress Completed: Reply: 0x4449444c0000
-ingress Err: IC0503: Canister rwlgt-iiaaa-aaaaa-aaaaa-cai trapped explicitly: Deprecated with enhanced orthogonal persistence
-Err: IC0503: Canister rwlgt-iiaaa-aaaaa-aaaaa-cai trapped explicitly: Deprecated with enhanced orthogonal persistence
-ingress Completed: Reject: IC0503: Canister rwlgt-iiaaa-aaaaa-aaaaa-cai trapped explicitly: Deprecated with enhanced orthogonal persistence
-ingress Completed: Reject: IC0503: Canister rwlgt-iiaaa-aaaaa-aaaaa-cai trapped explicitly: Deprecated with enhanced orthogonal persistence
+ingress Completed: Reply: 0x4449444c016c01c1c1cee2047801005118000000000000
+Ok: Reply: 0x4449444c016c01c1c1cee2047801005118000000000000
+ingress Completed: Reply: 0x4449444c0001785118000000000000
+ingress Completed: Reply: 0x4449444c0001785118000000000000
diff --git a/test/run-drun/ok/query-footprint.tc.ok b/test/run-drun/ok/query-footprint.tc.ok
@@ -1,3 +1,3 @@
-query-footprint.mo:4.16-4.17: warning [M0194], unused identifier s (delete or rename to wildcard `_` or `_s`)
-query-footprint.mo:6.9-6.13: warning [M0194], unused identifier lost (delete or rename to wildcard `_` or `_lost`)
-query-footprint.mo:18.16-18.20: warning [M0194], unused identifier expl (delete or rename to wildcard `_` or `_expl`)
+query-footprint.mo:5.16-5.17: warning [M0194], unused identifier s (delete or rename to wildcard `_` or `_s`)
+query-footprint.mo:7.9-7.13: warning [M0194], unused identifier lost (delete or rename to wildcard `_` or `_lost`)
+query-footprint.mo:19.16-19.20: warning [M0194], unused identifier expl (delete or rename to wildcard `_` or `_expl`)
diff --git a/test/run-drun/query-footprint-overflow.mo b/test/run-drun/query-footprint-overflow.mo
@@ -1,3 +1,4 @@
+//CLASSICAL-PERSISTENCE-ONLY
 import { Array_tabulate; stableVarQuery } = "mo:⛔"
 
 actor footprint = {

diff --git a/test/run-drun/query-footprint.mo b/test/run-drun/query-footprint.mo
@@ -1,3 +1,4 @@
+//CLASSICAL-PERSISTENCE-ONLY
 import { stableVarQuery } "mo:⛔";
 
 actor footprint = {