cleanup

src/state/bus.rs

@@ -1,8 +1,9 @@
 use bytemuck::{Pod, Zeroable};
 
-use crate::{impl_account_from_bytes, impl_to_bytes};
-
-use super::{AccountDiscriminator, Discriminator};
+use crate::{
+    impl_account_from_bytes, impl_to_bytes,
+    utils::{AccountDiscriminator, Discriminator},
+};
 
 #[repr(C)]
 #[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
@@ -18,7 +19,7 @@ pub struct Bus {
 }
 
 impl Discriminator for Bus {
-    fn discriminator() -> super::AccountDiscriminator {
+    fn discriminator() -> AccountDiscriminator {
         AccountDiscriminator::Bus
     }
 }

src/state/hash.rs

@@ -24,4 +24,3 @@ impl From<Hash> for KeccakHash {
 }
 
 impl_to_bytes!(Hash);
-// impl_account_from_bytes!(Hash);

src/state/mod.rs

@@ -5,18 +5,5 @@ mod treasury;
 
 pub use bus::*;
 pub use hash::*;
-use num_enum::{IntoPrimitive, TryFromPrimitive};
 pub use proof::*;
 pub use treasury::*;
-
-#[repr(u8)]
-#[derive(Clone, Copy, Debug, Eq, PartialEq, IntoPrimitive, TryFromPrimitive)]
-pub enum AccountDiscriminator {
-    Bus = 100,
-    Proof = 101,
-    Treasury = 102,
-}
-
-pub trait Discriminator {
-    fn discriminator() -> AccountDiscriminator;
-}

src/state/proof.rs

@@ -1,9 +1,11 @@
 use bytemuck::{Pod, Zeroable};
 use solana_program::pubkey::Pubkey;
 
-use crate::{impl_account_from_bytes, impl_to_bytes};
-
-use super::{AccountDiscriminator, Discriminator, Hash};
+use crate::{
+    impl_account_from_bytes, impl_to_bytes,
+    state::Hash,
+    utils::{AccountDiscriminator, Discriminator},
+};
 
 #[repr(C)]
 #[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
@@ -28,7 +30,7 @@ pub struct Proof {
 }
 
 impl Discriminator for Proof {
-    fn discriminator() -> super::AccountDiscriminator {
+    fn discriminator() -> AccountDiscriminator {
         AccountDiscriminator::Proof
     }
 }

src/state/treasury.rs

@@ -1,9 +1,11 @@
 use bytemuck::{Pod, Zeroable};
 use solana_program::pubkey::Pubkey;
 
-use crate::{impl_account_from_bytes, impl_to_bytes};
-
-use super::{AccountDiscriminator, Discriminator, Hash};
+use crate::{
+    impl_account_from_bytes, impl_to_bytes,
+    state::Hash,
+    utils::{AccountDiscriminator, Discriminator},
+};
 
 #[repr(C)]
 #[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
@@ -28,7 +30,7 @@ pub struct Treasury {
 }
 
 impl Discriminator for Treasury {
-    fn discriminator() -> super::AccountDiscriminator {
+    fn discriminator() -> AccountDiscriminator {
         AccountDiscriminator::Treasury
     }
 }