Fix things

Author: liferooter

ethexe/common/src/primitives.rs

@@ -78,7 +78,7 @@ pub struct SimpleBlockData {
     pub header: BlockHeader,
 }
 
-#[cfg_attr(feature = "serde", derive(Hash, serde::Serialize))]
+#[cfg_attr(feature = "serde", derive(Hash, serde::Serialize, serde::Deserialize))]
 #[derive(Clone, Debug, Encode, Decode, TypeInfo, PartialEq, Eq, derive_more::Display)]
 #[display(
     "Announce(block: {block_hash}, parent: {parent}, gas: {gas_allowance:?}, txs: {injected_transactions:?})"
@@ -140,7 +140,7 @@ pub enum PromisePolicy {
 }
 
 #[derive(PartialEq, Eq, Hash, Debug, Clone, Copy, Default, Encode, Decode, TypeInfo)]
-#[cfg_attr(feature = "std", derive(serde::Serialize))]
+#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 pub struct StateHashWithQueueSize {
     pub hash: H256,
     pub canonical_queue_size: u8,

ethexe/rpc/src/apis/mod.rs

@@ -26,7 +26,7 @@ pub use announce::{AnnounceApi, AnnounceServer};
 pub use block::{BlockApi, BlockServer};
 pub use code::{CodeApi, CodeServer};
 pub use injected::{InjectedApi, InjectedServer};
-pub use program::{ProgramApi, ProgramServer};
+pub use program::{FullProgramState, ProgramApi, ProgramServer};
 
 #[cfg(feature = "client")]
 pub use crate::apis::{

ethexe/rpc/src/lib.rs

@@ -17,7 +17,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 #[cfg(feature = "client")]
-pub use crate::apis::{BlockClient, CodeClient, FullProgramState, InjectedClient, ProgramClient};
+pub use crate::apis::{
+    AnnounceClient, BlockClient, CodeClient, FullProgramState, InjectedClient, ProgramClient,
+};
 
 use anyhow::Result;
 use apis::{