Fix increase_storage_compute_cost tests (#11133)

This fixes #10979

integration-tests/src/tests/client/features/increase_storage_compute_cost.rs

@@ -22,6 +22,7 @@ use near_primitives::transaction::{
 };
 use near_primitives::types::AccountId;
 use near_primitives::version::ProtocolFeature;
+use near_primitives_core::version::PROTOCOL_VERSION;
 use nearcore::test_utils::TestEnvNightshadeSetupExt;
 
 /// Tracked in https://github.com/near/nearcore/issues/8938
@@ -33,8 +34,6 @@ enum Expectation {
 }
 
 /// Test that `storage_write` compute limit is respected in new version.
-// TODO(10979): Fix and enable this test.
-#[ignore]
 #[test]
 fn test_storage_write() {
     //  `insert_strings(from: u64, to: u64)` makes (`to` - `from`) `storage_write` calls.
@@ -57,8 +56,6 @@ fn test_storage_write() {
 }
 
 /// Test that `storage_remove` compute limit is respected in new version.
-// TODO(10979): Fix and enable this test.
-#[ignore]
 #[test]
 fn test_storage_remove() {
     //  `delete_strings(from: u64, to: u64)` makes (`to` - `from`) `storage_remove` calls.
@@ -82,8 +79,6 @@ fn test_storage_remove() {
 
 /// Test that `storage_write` compute limit is respected in new version,
 /// specifically when running out of gas.
-// TODO(10979): Fix and enable this test.
-#[ignore]
 #[test]
 fn test_storage_write_gas_exceeded() {
     //  `insert_strings(from: u64, to: u64)` makes (`to` - `from`) `storage_write` calls.
@@ -107,8 +102,6 @@ fn test_storage_write_gas_exceeded() {
 }
 
 /// Check receipts that don't touch storage are unaffected by the new compute costs.
-// TODO(10979): Fix and enable this test.
-#[ignore]
 #[test]
 fn test_non_storage() {
     // `sum_n(u64)` just does some WASM computation.
@@ -139,8 +132,6 @@ fn test_non_storage() {
 }
 
 /// Test the case where a function call fails and the limit is unaffected by compute costs.
-// TODO(10979): Fix and enable this test.
-#[ignore]
 #[test]
 fn test_non_storage_gas_exceeded() {
     // `loop_forever()` loops until either gas is exhausted.
@@ -189,12 +180,12 @@ fn assert_compute_limit_reached(
     std::env::set_var("NEAR_TESTS_IMMEDIATE_PROTOCOL_UPGRADE", "1");
     near_o11y::testonly::init_test_logger();
 
-    let new_protocol_version = INCREASED_STORAGE_COSTS_PROTOCOL_VERSION;
+    let old_protocol_version = INCREASED_STORAGE_COSTS_PROTOCOL_VERSION - 1;
+    let new_protocol_version = PROTOCOL_VERSION;
     assert!(
         new_protocol_version >= ProtocolFeature::ComputeCosts.protocol_version(),
         "relies on compute costs feature"
     );
-    let old_protocol_version = new_protocol_version - 1;
 
     // Prepare TestEnv with a contract at the old protocol version.
     let epoch_length = 100;