chore: Remove NonConsumed cycles use case

rs/cycles_account_manager/src/cycles_account_manager.rs

@@ -982,7 +982,6 @@ impl CyclesAccountManager {
             | CyclesUseCase::VetKd
             | CyclesUseCase::HTTPOutcalls
             | CyclesUseCase::DeletedCanisters
-            | CyclesUseCase::NonConsumed
             | CyclesUseCase::BurnedCycles
             | CyclesUseCase::DroppedMessages => system_state.balance(),
         };
@@ -995,7 +994,6 @@ impl CyclesAccountManager {
             reveal_top_up,
         )?;
 
-        debug_assert_ne!(use_case, CyclesUseCase::NonConsumed);
         system_state.consume_cycles(cycles);
         Ok(())
     }

rs/protobuf/def/state/canister_state_bits/v1/canister_state_bits.proto

@@ -256,6 +256,8 @@ message ExecutionTask {
 }
 
 enum CyclesUseCase {
+  reserved 11;
+
   CYCLES_USE_CASE_UNSPECIFIED = 0;
   CYCLES_USE_CASE_MEMORY = 1;
   CYCLES_USE_CASE_COMPUTE_ALLOCATION = 2;
@@ -267,7 +269,6 @@ enum CyclesUseCase {
   CYCLES_USE_CASE_ECDSA_OUTCALLS = 8;
   CYCLES_USE_CASE_HTTP_OUTCALLS = 9;
   CYCLES_USE_CASE_DELETED_CANISTERS = 10;
-  CYCLES_USE_CASE_NON_CONSUMED = 11;
   CYCLES_USE_CASE_BURNED_CYCLES = 12;
   CYCLES_USE_CASE_SCHNORR_OUTCALLS = 13;
   CYCLES_USE_CASE_VET_KD = 14;

rs/protobuf/src/gen/state/state.canister_state_bits.v1.rs

@@ -907,7 +907,6 @@ pub enum CyclesUseCase {
     EcdsaOutcalls = 8,
     HttpOutcalls = 9,
     DeletedCanisters = 10,
-    NonConsumed = 11,
     BurnedCycles = 12,
     SchnorrOutcalls = 13,
     VetKd = 14,
@@ -933,7 +932,6 @@ impl CyclesUseCase {
             Self::EcdsaOutcalls => "CYCLES_USE_CASE_ECDSA_OUTCALLS",
             Self::HttpOutcalls => "CYCLES_USE_CASE_HTTP_OUTCALLS",
             Self::DeletedCanisters => "CYCLES_USE_CASE_DELETED_CANISTERS",
-            Self::NonConsumed => "CYCLES_USE_CASE_NON_CONSUMED",
             Self::BurnedCycles => "CYCLES_USE_CASE_BURNED_CYCLES",
             Self::SchnorrOutcalls => "CYCLES_USE_CASE_SCHNORR_OUTCALLS",
             Self::VetKd => "CYCLES_USE_CASE_VET_KD",
@@ -956,7 +954,6 @@ impl CyclesUseCase {
             "CYCLES_USE_CASE_ECDSA_OUTCALLS" => Some(Self::EcdsaOutcalls),
             "CYCLES_USE_CASE_HTTP_OUTCALLS" => Some(Self::HttpOutcalls),
             "CYCLES_USE_CASE_DELETED_CANISTERS" => Some(Self::DeletedCanisters),
-            "CYCLES_USE_CASE_NON_CONSUMED" => Some(Self::NonConsumed),
             "CYCLES_USE_CASE_BURNED_CYCLES" => Some(Self::BurnedCycles),
             "CYCLES_USE_CASE_SCHNORR_OUTCALLS" => Some(Self::SchnorrOutcalls),
             "CYCLES_USE_CASE_VET_KD" => Some(Self::VetKd),

rs/replicated_state/src/canister_state/system_state.rs

@@ -1897,7 +1897,6 @@ impl SystemState {
             | CyclesUseCase::VetKd
             | CyclesUseCase::HTTPOutcalls
             | CyclesUseCase::DeletedCanisters
-            | CyclesUseCase::NonConsumed
             | CyclesUseCase::BurnedCycles
             | CyclesUseCase::DroppedMessages => requested_real,
         };
@@ -1983,13 +1982,6 @@ impl SystemState {
         debug_assert_ne!(use_case, CyclesUseCase::DeletedCanisters);
         debug_assert_ne!(use_case, CyclesUseCase::DroppedMessages);
 
-        // CyclesUseCase::NonConsumed should never be sent to this function.
-        debug_assert_ne!(
-            use_case,
-            CyclesUseCase::NonConsumed,
-            "Non-consumed cycles should not be tracked in the canister metrics."
-        );
-
         // `prepayment` must be greater or equal to `refund`.
         // `refund` must be 0 when we are handling a prepayment.
         debug_assert!(
@@ -2040,8 +2032,7 @@ impl SystemState {
                     | CyclesUseCase::VetKd
                     | CyclesUseCase::HTTPOutcalls
                     | CyclesUseCase::DeletedCanisters
-                    | CyclesUseCase::DroppedMessages
-                    | CyclesUseCase::NonConsumed => {
+                    | CyclesUseCase::DroppedMessages => {
                         // These use cases should not be tracked on the canister level.
                     }
                 }

rs/replicated_state/src/metadata_state.rs

@@ -476,8 +476,6 @@ impl SubnetMetrics {
                 CyclesUseCase::ECDSAOutcalls
                 | CyclesUseCase::HTTPOutcalls
                 | CyclesUseCase::DeletedCanisters => {}
-                // Non consumed cycles should not be counted towards the total consumed.
-                CyclesUseCase::NonConsumed => {}
                 // For the remaining use cases simply add the values to the total.
                 CyclesUseCase::Memory
                 | CyclesUseCase::ComputeAllocation

rs/replicated_state/src/metadata_state/tests.rs

@@ -2384,7 +2384,6 @@ fn consumed_cycles_total_calculates_the_right_amount() {
     consumed_cycles_by_use_case.insert(CyclesUseCase::Instructions, NominalCycles::new(100));
     consumed_cycles_by_use_case.insert(CyclesUseCase::Memory, NominalCycles::new(50));
     consumed_cycles_by_use_case.insert(CyclesUseCase::CanisterCreation, NominalCycles::new(40));
-    consumed_cycles_by_use_case.insert(CyclesUseCase::NonConsumed, NominalCycles::new(10));
 
     let subnet_metrics = SubnetMetrics {
         consumed_cycles_by_deleted_canisters: NominalCycles::new(10),
@@ -2840,7 +2839,7 @@ fn compatibility_for_cycles_use_case() {
         CyclesUseCase::iter()
             .map(|x| x as i32)
             .collect::<Vec<i32>>(),
-        [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+        [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13, 14, 15]
     );
 }
 

rs/test_utilities/state/src/lib.rs

@@ -1103,7 +1103,6 @@ pub(crate) fn arb_cycles_use_case() -> impl Strategy<Value = CyclesUseCase> {
         Just(CyclesUseCase::ECDSAOutcalls),
         Just(CyclesUseCase::HTTPOutcalls),
         Just(CyclesUseCase::DeletedCanisters),
-        Just(CyclesUseCase::NonConsumed),
     ]
 }
 

rs/types/cycles/src/compound_cycles.rs

@@ -87,10 +87,6 @@ impl<T: CyclesUseCaseKind> CompoundCycles<T> {
         let nominal = NominalCycles::new_private(amount.get());
         let real = match (use_case, cost_schedule) {
             (_, CanisterCyclesCostSchedule::Normal)
-            // NonConsumed represents the amounts attached on inter-canister
-            // calls and it's removed from a canister's balance regardless of
-            // cost_schedule.
-            | (CyclesUseCase::NonConsumed, CanisterCyclesCostSchedule::Free)
             // BurnedCycles represents the amount requested explicitly to be
             // burned via `ic0.cyles_burn` and it's removed from the balance
             // regardless of cost_schedule. 

rs/types/cycles/src/cycles_use_case.rs

@@ -17,7 +17,6 @@ pub enum CyclesUseCase {
     ECDSAOutcalls = 8,
     HTTPOutcalls = 9,
     DeletedCanisters = 10,
-    NonConsumed = 11,
     BurnedCycles = 12,
     SchnorrOutcalls = 13,
     VetKd = 14,
@@ -39,7 +38,6 @@ impl CyclesUseCase {
             Self::ECDSAOutcalls => "ECDSAOutcalls",
             Self::HTTPOutcalls => "HTTPOutcalls",
             Self::DeletedCanisters => "DeletedCanisters",
-            Self::NonConsumed => "NonConsumed",
             Self::BurnedCycles => "BurnedCycles",
             Self::SchnorrOutcalls => "SchnorrOutcalls",
             Self::VetKd => "VetKd",
@@ -63,7 +61,6 @@ impl From<CyclesUseCase> for pb::CyclesUseCase {
             CyclesUseCase::ECDSAOutcalls => pb::CyclesUseCase::EcdsaOutcalls,
             CyclesUseCase::HTTPOutcalls => pb::CyclesUseCase::HttpOutcalls,
             CyclesUseCase::DeletedCanisters => pb::CyclesUseCase::DeletedCanisters,
-            CyclesUseCase::NonConsumed => pb::CyclesUseCase::NonConsumed,
             CyclesUseCase::BurnedCycles => pb::CyclesUseCase::BurnedCycles,
             CyclesUseCase::SchnorrOutcalls => pb::CyclesUseCase::SchnorrOutcalls,
             CyclesUseCase::VetKd => pb::CyclesUseCase::VetKd,
@@ -93,7 +90,6 @@ impl TryFrom<pb::CyclesUseCase> for CyclesUseCase {
             pb::CyclesUseCase::EcdsaOutcalls => Ok(Self::ECDSAOutcalls),
             pb::CyclesUseCase::HttpOutcalls => Ok(Self::HTTPOutcalls),
             pb::CyclesUseCase::DeletedCanisters => Ok(Self::DeletedCanisters),
-            pb::CyclesUseCase::NonConsumed => Ok(Self::NonConsumed),
             pb::CyclesUseCase::BurnedCycles => Ok(Self::BurnedCycles),
             pb::CyclesUseCase::SchnorrOutcalls => Ok(Self::SchnorrOutcalls),
             pb::CyclesUseCase::VetKd => Ok(Self::VetKd),
@@ -214,15 +210,6 @@ impl CyclesUseCaseKind for DeletedCanisters {
     }
 }
 
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
-pub struct NonConsumed;
-
-impl CyclesUseCaseKind for NonConsumed {
-    fn cycles_use_case() -> CyclesUseCase {
-        CyclesUseCase::NonConsumed
-    }
-}
-
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
 pub struct BurnedCycles;
 

rs/types/cycles/src/lib.rs

@@ -10,7 +10,7 @@ pub use cycles_cost_schedule::CanisterCyclesCostSchedule;
 pub use cycles_use_case::{
     BurnedCycles, CanisterCreation, ComputeAllocation, CyclesUseCase, CyclesUseCaseKind,
     CyclesUseCaseRefundableKind, DeletedCanisters, DroppedMessages, ECDSAOutcalls, HTTPOutcalls,
-    IngressInduction, Instructions, Memory, NonConsumed, RequestAndResponseTransmission,
-    SchnorrOutcalls, Uninstall, VetKd,
+    IngressInduction, Instructions, Memory, RequestAndResponseTransmission, SchnorrOutcalls,
+    Uninstall, VetKd,
 };
 pub use nominal_cycles::{NominalCycles, testing::NominalCyclesTesting};