Merge pull request #3061 from autonomys/better-type-in-rpc

Better type in RPC
autonomys · Sep 24, 2024 · b7bb137 · b7bb137
2 parents f24d669 + 8a3fe0a
commit b7bb137
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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.