make ci fail with insufficient dev-utils marking

solana-labs · Jul 4, 2023 · 1b81a77 · 1b81a77
1 parent 6e6d189
commit 1b81a77
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml
@@ -32,6 +32,7 @@ thiserror = { workspace = true }
 
 [dev-dependencies]
 solana-logger = { workspace = true }
+solana-sdk = { workspace = true, features = ["dev-context-only-utils"] }
 
 [lib]
 crate-type = ["lib"]

diff --git a/programs/zk-token-proof/src/lib.rs b/programs/zk-token-proof/src/lib.rs
@@ -64,7 +64,7 @@ where
             return Err(InstructionError::InvalidAccountData);
         }
 
-        proof_context_account.set_data(context_state_data)?;
+        proof_context_account.set_data_from_slice(&context_state_data)?;
     }
 
     Ok(())

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -35,6 +35,7 @@ full = [
     "sha3",
     "digest",
 ]
+dev-context-only-utils = []
 
 [dependencies]
 assert_matches = { workspace = true, optional = true }

diff --git a/sdk/src/transaction_context.rs b/sdk/src/transaction_context.rs
@@ -888,7 +888,10 @@ impl<'a> BorrowedAccount<'a> {
     /// account mapping is enabled.
     ///
     /// Currently only used by tests and the program-test crate.
-    #[cfg(not(target_os = "solana"))]
+    #[cfg(all(
+        not(target_os = "solana"),
+        any(test, feature = "dev-context-only-utils")
+    ))]
     pub fn set_data(&mut self, data: Vec<u8>) -> Result<(), InstructionError> {
         self.can_data_be_resized(data.len())?;
         self.can_data_be_changed()?;
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ where @@
                 return Err(InstructionError::InvalidAccountData);
             }
-            proof_context_account.set_data(context_state_data)?;
+            proof_context_account.set_data_from_slice(&context_state_data)?;
         }
         Ok(())
@@ Expand Down @@