move to program folder

solana-labs · Oct 18, 2023 · 514bc34 · 514bc34
1 parent da5bd23
commit 514bc34
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ members = [
   "examples/rust/sysvar",
   "examples/rust/transfer-lamports",
   "examples/rust/transfer-tokens",
-  "feature-gate",
+  "feature-gate/program",
   "feature-proposal/program",
   "feature-proposal/cli",
   "governance/addin-mock/program",

diff --git a/feature-gate/README.md b/feature-gate/README.md
@@ -2,8 +2,7 @@
 
 This program serves to manage new features on Solana.
 
-It serves two main purposes: activating new features and revoking features that
-are pending activation.
+It serves one purpose: revoking features that are pending activation.
 
 More information & documentation will follow as this program matures, but you
 can follow the discussions

diff --git a/feature-gate/Cargo.toml → feature-gate/program/Cargo.toml b/feature-gate/Cargo.toml → feature-gate/program/Cargo.toml
@@ -14,7 +14,7 @@ test-sbf = []
 [dependencies]
 num_enum = "0.7.0"
 solana-program = "1.16.16"
-spl-program-error = { version = "0.3.0", path = "../libraries/program-error" }
+spl-program-error = { version = "0.3.0", path = "../../libraries/program-error" }
 
 [dev-dependencies]
 solana-program-test = "1.16.16"

diff --git a/feature-gate/src/entrypoint.rs → feature-gate/program/src/entrypoint.rs b/feature-gate/src/entrypoint.rs → feature-gate/program/src/entrypoint.rs
diff --git a/feature-gate/src/error.rs → feature-gate/program/src/error.rs b/feature-gate/src/error.rs → feature-gate/program/src/error.rs
@@ -8,7 +8,7 @@ pub enum FeatureGateError {
     /// Operation overflowed
     #[error("Operation overflowed")]
     Overflow,
-    /// Feature not inactive
-    #[error("Feature not inactive")]
+    /// Feature already activated
+    #[error("Feature already activated")]
     FeatureAlreadyActivated,
 }
diff --git a/feature-gate/src/instruction.rs → feature-gate/program/src/instruction.rs b/feature-gate/src/instruction.rs → feature-gate/program/src/instruction.rs
@@ -23,8 +23,8 @@ pub enum FeatureGateInstruction {
     ///
     /// Accounts expected by this instruction:
     ///
-    ///   0. `[w+s]` Feature account
-    ///   1. `[w]` Destination (for rent lamports)
+    ///   0. `[w+s]`    Feature account
+    ///   1. `[w]`      Destination (for rent lamports)
     RevokePendingActivation,
 }
 impl FeatureGateInstruction {
@@ -45,9 +45,9 @@ impl FeatureGateInstruction {
 }
 
 /// Creates a 'RevokePendingActivation' instruction.
-pub fn revoke_pending_activation(feature: &Pubkey, destination: &Pubkey) -> Instruction {
+pub fn revoke_pending_activation(feature_id: &Pubkey, destination: &Pubkey) -> Instruction {
     let accounts = vec![
-        AccountMeta::new(*feature, true),
+        AccountMeta::new(*feature_id, true),
         AccountMeta::new(*destination, false),
     ];
 
@@ -71,7 +71,7 @@ mod test {
     }
 
     #[test]
-    fn test_pack_unpack_revoke() {
+    fn test_pack_unpack_revoke_pending_activation() {
         test_pack_unpack(&FeatureGateInstruction::RevokePendingActivation);
     }
 }
diff --git a/feature-gate/src/lib.rs → feature-gate/program/src/lib.rs b/feature-gate/src/lib.rs → feature-gate/program/src/lib.rs
diff --git a/feature-gate/src/processor.rs → feature-gate/program/src/processor.rs b/feature-gate/src/processor.rs → feature-gate/program/src/processor.rs
diff --git a/feature-gate/tests/functional.rs → feature-gate/program/tests/functional.rs b/feature-gate/tests/functional.rs → feature-gate/program/tests/functional.rs
@@ -1,4 +1,4 @@
-// #![cfg(feature = "test-sbf")]
+#![cfg(feature = "test-sbf")]
 
 use {
     solana_program::instruction::InstructionError,