From 8a3fe0a2197b7e96dd361717124e0e518ccccf86 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Tue, 24 Sep 2024 16:03:40 +0300
Subject: [PATCH] Better type in RPC

---
 crates/sc-consensus-subspace-rpc/src/lib.rs                   | 2 +-
 crates/subspace-farmer/src/single_disk_farm/reward_signing.rs | 2 +-
 crates/subspace-rpc-primitives/src/lib.rs                     | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/crates/sc-consensus-subspace-rpc/src/lib.rs b/crates/sc-consensus-subspace-rpc/src/lib.rs
index 04e87b39e8..6b50ff01f7 100644
--- a/crates/sc-consensus-subspace-rpc/src/lib.rs
+++ b/crates/sc-consensus-subspace-rpc/src/lib.rs
@@ -553,7 +553,7 @@ where
                 // This will be sent to the farmer
                 RewardSigningInfo {
                     hash: hash.into(),
-                    public_key: *public_key,
+                    public_key,
                 }
             },
         );
diff --git a/crates/subspace-farmer/src/single_disk_farm/reward_signing.rs b/crates/subspace-farmer/src/single_disk_farm/reward_signing.rs
index c05a155157..d9352770c2 100644
--- a/crates/subspace-farmer/src/single_disk_farm/reward_signing.rs
+++ b/crates/subspace-farmer/src/single_disk_farm/reward_signing.rs
@@ -21,7 +21,7 @@ where
             reward_signing_info_notifications.next().await
         {
             // Multiple plots might have solved, only sign with correct one
-            if identity.public_key().to_bytes() != public_key {
+            if identity.public_key().to_bytes() != *public_key {
                 continue;
             }
 
diff --git a/crates/subspace-rpc-primitives/src/lib.rs b/crates/subspace-rpc-primitives/src/lib.rs
index 7408a5867a..fa7d9cec4d 100644
--- a/crates/subspace-rpc-primitives/src/lib.rs
+++ b/crates/subspace-rpc-primitives/src/lib.rs
@@ -133,7 +133,6 @@ pub struct SolutionResponse {
     pub solution: Solution<PublicKey>,
 }
 
-// TODO: Use better types here
 /// Reward info that needs to be signed.
 #[derive(Clone, Copy, Debug, Encode, Decode, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -142,8 +141,7 @@ pub struct RewardSigningInfo {
     #[serde(with = "hex")]
     pub hash: [u8; 32],
     /// Public key of the plot identity that should create signature.
-    #[serde(with = "hex")]
-    pub public_key: [u8; 32],
+    pub public_key: PublicKey,
 }
 
 /// Signature in response to reward hash signing request.