f

Author: punwai

crates/sui-config/tests/snapshots/snapshot_tests__empty_genesis_snapshot_matches.snap

@@ -4,23 +4,13 @@ expression: common_costs_estimate
 ---
 {
   "MergeCoin": {
-<<<<<<< HEAD
-    "computation_cost": 6724,
-    "storage_cost": 6968,
+    "computation_cost": 6975,
+    "storage_cost": 7340,
     "storage_rebate": 0
   },
   "Publish": {
-    "computation_cost": 6713,
-    "storage_cost": 6903,
-=======
-    "computation_cost": 6863,
-    "storage_cost": 7174,
-    "storage_rebate": 0
-  },
-  "Publish": {
-    "computation_cost": 6852,
-    "storage_cost": 7110,
->>>>>>> eea1f5632 (F)
+    "computation_cost": 6964,
+    "storage_cost": 7275,
     "storage_rebate": 0
   },
   "SharedCounterAssertValue": {
@@ -39,13 +29,8 @@ expression: common_costs_estimate
     "storage_rebate": 0
   },
   "SplitCoin": {
-<<<<<<< HEAD
-    "computation_cost": 6702,
-    "storage_cost": 6935,
-=======
-    "computation_cost": 6842,
-    "storage_cost": 7142,
->>>>>>> eea1f5632 (F)
+    "computation_cost": 6954,
+    "storage_cost": 7308,
     "storage_rebate": 0
   },
   "TransferPortionSuiCoin": {

crates/sui-cost/tests/snapshots/empirical_transaction_cost__good_snapshot-2.snap

@@ -4,12 +4,12 @@ expression: common_costs_actual
 ---
 {
   "MergeCoin": {
-    "computation_cost": 2564,
+    "computation_cost": 2592,
     "storage_cost": 32,
     "storage_rebate": 0
   },
   "Publish": {
-    "computation_cost": 2599,
+    "computation_cost": 2627,
     "storage_cost": 83,
     "storage_rebate": 0
   },
@@ -29,7 +29,7 @@ expression: common_costs_actual
     "storage_rebate": 15
   },
   "SplitCoin": {
-    "computation_cost": 2575,
+    "computation_cost": 2603,
     "storage_cost": 80,
     "storage_rebate": 0
   },