Switch to classic math

programs/network/src/instructions/pool_rotate.rs

@@ -31,7 +31,7 @@ pub struct PoolRotate<'info> {
 
     #[account(
         address = snapshot.pubkey(),
-        constraint = snapshot.id.eq(&registry.current_epoch)
+        constraint = snapshot.id == registry.current_epoch
     )]
     pub snapshot: Account<'info, Snapshot>,
 

programs/network/src/instructions/worker_create.rs

@@ -52,7 +52,7 @@ pub struct WorkerCreate<'info> {
     )]
     pub registry: Account<'info, Registry>,
 
-    #[account(constraint = signatory.key().ne(&authority.key()) @ ClockworkError::InvalidSignatory)]
+    #[account(constraint = signatory.key() != authority.key() @ ClockworkError::InvalidSignatory)]
     pub signatory: Signer<'info>,
 
     pub system_program: Program<'info, System>,

programs/network/src/jobs/delete_snapshot/process_snapshot.rs

@@ -47,7 +47,7 @@ pub fn handler(ctx: Context<DeleteSnapshotProcessSnapshot>) -> Result<ThreadResp
     }
 
     // Build next instruction the thread.
-    let dynamic_instruction = if snapshot.total_frames.gt(&0) {
+    let dynamic_instruction = if snapshot.total_frames > 0 {
         // There are frames in this snapshot. Delete them.
         Some(
             Instruction {

programs/network/src/jobs/distribute_fees/process_frame.rs

@@ -24,7 +24,7 @@ pub struct DistributeFeesProcessFrame<'info> {
 
     #[account(
         address = snapshot.pubkey(),
-        constraint = snapshot.id.eq(&registry.current_epoch)
+        constraint = snapshot.id == registry.current_epoch
     )]
     pub snapshot: Account<'info, Snapshot>,
 

programs/network/src/jobs/distribute_fees/process_snapshot.rs

@@ -31,7 +31,7 @@ pub struct DistributeFeesProcessSnapshot<'info> {
 
     #[account(
         address = snapshot.pubkey(),
-        constraint = snapshot.id.eq(&registry.current_epoch)
+        constraint = snapshot.id == registry.current_epoch
     )]
     pub snapshot: Account<'info, Snapshot>,
 

programs/network/src/jobs/stake_delegations/process_worker.rs

@@ -30,7 +30,7 @@ pub fn handler(ctx: Context<StakeDelegationsProcessWorker>) -> Result<ThreadResp
     let worker = &ctx.accounts.worker;
 
     // Build the next instruction for the thread.
-    let dynamic_instruction = if worker.total_delegations.gt(&0) {
+    let dynamic_instruction = if worker.total_delegations > 0 {
         // This worker has delegations. Stake their deposits.
         let delegation_pubkey = Delegation::pubkey(worker.key(), 0);
         Some(
@@ -54,12 +54,7 @@ pub fn handler(ctx: Context<StakeDelegationsProcessWorker>) -> Result<ThreadResp
             }
             .into(),
         )
-    } else if worker
-        .id
-        .checked_add(1)
-        .unwrap()
-        .lt(&registry.total_workers)
-    {
+    } else if (worker.id + 1) < registry.total_workers {
         // This worker has no delegations. Move on to the next worker.
         Some(
             Instruction {
@@ -68,7 +63,7 @@ pub fn handler(ctx: Context<StakeDelegationsProcessWorker>) -> Result<ThreadResp
                     config: config.key(),
                     registry: registry.key(),
                     thread: thread.key(),
-                    worker: Worker::pubkey(worker.id.checked_add(1).unwrap()),
+                    worker: Worker::pubkey(worker.id + 1),
                 }
                 .to_account_metas(Some(true)),
                 data: crate::instruction::StakeDelegationsProcessWorker {}.data(),

programs/network/src/jobs/take_snapshot/create_entry.rs

@@ -11,7 +11,7 @@ pub struct TakeSnapshotCreateEntry<'info> {
 
     #[account(
         address = delegation.pubkey(),
-        constraint = delegation.id.eq(&snapshot_frame.total_entries),
+        constraint = delegation.id == snapshot_frame.total_entries,
         has_one = worker,
     )]
     pub delegation: Box<Account<'info, Delegation>>,
@@ -27,7 +27,7 @@ pub struct TakeSnapshotCreateEntry<'info> {
 
     #[account(
         address = snapshot.pubkey(),
-        constraint = registry.current_epoch.checked_add(1).unwrap().eq(&snapshot.id)
+        constraint = (registry.current_epoch + 1) == snapshot.id
     )]
     pub snapshot: Box<Account<'info, Snapshot>>,
 
@@ -64,7 +64,7 @@ pub struct TakeSnapshotCreateEntry<'info> {
 
     #[account(
         address = worker.pubkey(),
-        constraint = worker.id.eq(&snapshot_frame.id),
+        constraint = worker.id == snapshot_frame.id,
     )]
     pub worker: Box<Account<'info, Worker>>,
 }

programs/network/src/jobs/take_snapshot/job.rs

@@ -36,7 +36,7 @@ pub fn handler(ctx: Context<TakeSnapshotJob>) -> Result<ThreadResponse> {
                     config: config.key(),
                     payer: PAYER_PUBKEY,
                     registry: registry.key(),
-                    snapshot: Snapshot::pubkey(registry.current_epoch.checked_add(1).unwrap()),
+                    snapshot: Snapshot::pubkey(registry.current_epoch + 1),
                     system_program: system_program::ID,
                     thread: thread.key(),
                 }

programs/thread/src/instructions/thread_exec.rs

@@ -176,12 +176,7 @@ pub fn handler(ctx: Context<ThreadExec>) -> Result<()> {
     thread.exec_context = Some(ExecContext {
         exec_index,
         execs_since_slot: if clock.slot == thread.exec_context.unwrap().last_exec_at {
-            thread
-                .exec_context
-                .unwrap()
-                .execs_since_slot
-                .checked_add(1)
-                .unwrap()
+            thread.exec_context.unwrap().execs_since_slot + 1
         } else {
             1
         },

programs/thread/src/state/thread.rs

@@ -11,6 +11,7 @@ pub use clockwork_utils::thread::Equality;
 use crate::constants::{NEXT_INSTRUCTION_SIZE, SEED_THREAD};
 
 /// Tracks the current state of a transaction thread on Solana.
+// TODO Wait for the next version of Anchor to implement InitSpace macro
 #[account]
 #[derive(Debug)]
 pub struct Thread {