refactor: move the constraints to seed to make usage explicit

gumhq · Mar 29, 2023 · a19903f · a19903f
1 parent d6dfe58
commit a19903f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 23 deletions.
diff --git a/programs/gpl_core/src/instructions/connection.rs b/programs/gpl_core/src/instructions/connection.rs
@@ -58,12 +58,14 @@ pub struct CreateConnection<'info> {
         seeds = [
             SessionToken::SEED_PREFIX.as_bytes(),
             crate::id().as_ref(),
-            session_token.session_signer.key().as_ref(),
-            session_token.authority.key().as_ref()
+            // Session Signer
+            authority.key().as_ref(),
+            // User Authority
+            user.authority.as_ref(),
         ],
         seeds::program = GplSession::id(),
         bump,
-        constraint = session_token.is_valid()? && session_token.session_signer.key() == authority.key(),
+        constraint = session_token.is_valid()?
     )]
     pub session_token: Option<Account<'info, SessionToken>>,
 
@@ -146,12 +148,14 @@ pub struct DeleteConnection<'info> {
         seeds = [
             SessionToken::SEED_PREFIX.as_bytes(),
             crate::id().as_ref(),
-            session_token.session_signer.key().as_ref(),
-            session_token.authority.key().as_ref()
+            // Session Signer
+            authority.key().as_ref(),
+            // User Authority
+            user.authority.as_ref(),
         ],
         seeds::program = GplSession::id(),
         bump,
-        constraint = session_token.is_valid()? && session_token.session_signer.key() == authority.key(),
+        constraint = session_token.is_valid()?
     )]
     pub session_token: Option<Account<'info, SessionToken>>,
 

diff --git a/programs/gpl_core/src/instructions/post.rs b/programs/gpl_core/src/instructions/post.rs
@@ -51,12 +51,14 @@ pub struct CreatePost<'info> {
         seeds = [
             SessionToken::SEED_PREFIX.as_bytes(),
             crate::id().as_ref(),
-            session_token.session_signer.key().as_ref(),
-            session_token.authority.key().as_ref()
+            // Session Signer
+            authority.key().as_ref(),
+            // User Authority
+            user.authority.as_ref(),
         ],
         seeds::program = GplSession::id(),
         bump,
-        constraint = session_token.is_valid()? && session_token.session_signer.key() == authority.key(),
+        constraint = session_token.is_valid()?,
     )]
     pub session_token: Option<Account<'info, SessionToken>>,
 
@@ -207,13 +209,15 @@ pub struct CreateComment<'info> {
     #[account(
         seeds = [
             SessionToken::SEED_PREFIX.as_bytes(),
-            session_token.target_program.key().as_ref(),
-            session_token.session_signer.key().as_ref(),
-            session_token.authority.key().as_ref()
+            crate::id().as_ref(),
+            // Session Signer
+            authority.key().as_ref(),
+            // User Authority
+            user.authority.as_ref(),
         ],
         seeds::program = GplSession::id(),
         bump,
-        constraint = session_token.is_valid()? && session_token.session_signer.key() == authority.key(),
+        constraint = session_token.is_valid()?
     )]
     pub session_token: Option<Account<'info, SessionToken>>,
     #[account(mut)]
@@ -289,12 +293,14 @@ pub struct DeletePost<'info> {
         seeds = [
             SessionToken::SEED_PREFIX.as_bytes(),
             crate::id().as_ref(),
-            session_token.session_signer.key().as_ref(),
-            session_token.authority.key().as_ref()
+            // Session Signer
+            authority.key().as_ref(),
+            // User Authority
+            user.authority.as_ref(),
         ],
         seeds::program = GplSession::id(),
         bump,
-        constraint = session_token.is_valid()? && session_token.session_signer.key() == authority.key(),
+        constraint = session_token.is_valid()?
     )]
     pub session_token: Option<Account<'info, SessionToken>>,
     #[account(mut)]

diff --git a/programs/gpl_core/src/instructions/reaction.rs b/programs/gpl_core/src/instructions/reaction.rs
@@ -59,12 +59,14 @@ pub struct CreateReaction<'info> {
         seeds = [
             SessionToken::SEED_PREFIX.as_bytes(),
             crate::id().as_ref(),
-            session_token.session_signer.key().as_ref(),
-            session_token.authority.key().as_ref()
+            // Session Signer
+            authority.key().as_ref(),
+            // User Authority
+            user.authority.as_ref(),
         ],
         seeds::program = GplSession::id(),
         bump,
-        constraint = session_token.is_valid()? && session_token.session_signer.key() == authority.key(),
+        constraint = session_token.is_valid()?
     )]
     pub session_token: Option<Account<'info, SessionToken>>,
 
@@ -145,12 +147,14 @@ pub struct DeleteReaction<'info> {
         seeds = [
             SessionToken::SEED_PREFIX.as_bytes(),
             crate::id().as_ref(),
-            session_token.session_signer.key().as_ref(),
-            session_token.authority.key().as_ref()
+            // Session Signer
+            authority.key().as_ref(),
+            // User Authority
+            user.authority.as_ref(),
         ],
         seeds::program = GplSession::id(),
         bump,
-        constraint = session_token.is_valid()? && session_token.session_signer.key() == authority.key(),
+        constraint = session_token.is_valid()?
     )]
     pub session_token: Option<Account<'info, SessionToken>>,
     #[account(mut)]

diff --git a/tests/gpl_core/post.spec.ts b/tests/gpl_core/post.spec.ts
@@ -183,7 +183,7 @@ describe("Post", async () => {
         await post.signers([randomUser]).rpc();
       } catch (error: any) {
         expect(error).to.be.an("error");
-        expect(error.toString()).to.contain("Error Code: ConstraintRaw");
+        expect(error.toString()).to.contain("Error Code: ConstraintSeeds");
       }
     });