add internal methods for FfiContactInfoInterface, cargo-fmt, add safe…

…ty tags
anza-xyz · Nov 7, 2024 · c635fee · c635fee
1 parent 30d5d73
commit c635fee
Show file tree

Hide file tree

Showing 4 changed files with 287 additions and 127 deletions.
diff --git a/geyser-plugin-interface/Cargo.toml b/geyser-plugin-interface/Cargo.toml
@@ -11,9 +11,9 @@ edition = { workspace = true }
 
 [dependencies]
 log = { workspace = true }
+solana-gossip = { workspace = true }
 solana-sdk = { workspace = true }
 solana-transaction-status = { workspace = true }
-solana-gossip = { workspace = true }
 thiserror = { workspace = true }
 
 [package.metadata.docs.rs]

diff --git a/geyser-plugin-interface/src/geyser_plugin_interface.rs b/geyser-plugin-interface/src/geyser_plugin_interface.rs
@@ -304,6 +304,10 @@ pub enum GeyserPluginError {
     /// Error when updating the transaction.
     #[error("Error updating transaction. Error message: ({msg})")]
     TransactionUpdateError { msg: String },
+
+    /// Error when updating the node status.
+    #[error("Error updating node. Error message: ({msg})")]
+    NodeUpdateError { msg: String },
 }
 
 /// The current status of a slot

diff --git a/geyser-plugin-manager/src/gossip_message_receiver_notifier.rs b/geyser-plugin-manager/src/gossip_message_receiver_notifier.rs
@@ -4,8 +4,7 @@ use {
     agave_geyser_plugin_interface::geyser_plugin_interface::FfiPubkey,
     log::*,
     solana_gossip::{
-        contact_info::ContactInfo,
-        contact_info_ffi::create_contact_info_interface,
+        contact_info::ContactInfo, contact_info_ffi::create_contact_info_interface,
         gossip_message_notifier_interface::GossipMessageNotifierInterface,
     },
     solana_measure::measure::Measure,
@@ -21,7 +20,7 @@ pub(crate) struct GossipMessageNotifierImpl {
 
 impl GossipMessageNotifierInterface for GossipMessageNotifierImpl {
     fn notify_receive_node_update(&self, contact_info: &ContactInfo) {
-        self.notify_plugins_of_node_update(&contact_info);
+        self.notify_plugins_of_node_update(contact_info);
     }
 
     fn notify_remove_node(&self, pubkey: &Pubkey) {
@@ -55,15 +54,15 @@ impl GossipMessageNotifierImpl {
             match plugin.notify_node_update(&ffi_contact_info_interface) {
                 Err(err) => {
                     error!(
-                        "Failed to insert crds value w/ origin: {}, error: {} to plugin {}",
+                        "Failed to insert ContactInfo w/ origin: {}, error: {} to plugin {}",
                         contact_info.pubkey(),
                         err,
                         plugin.name()
                     )
                 }
                 Ok(_) => {
                     trace!(
-                        "Inserted crds value w/ origin: {} to plugin {}",
+                        "Inserted ContactInfo w/ origin: {} to plugin {}",
                         contact_info.pubkey(),
                         plugin.name()
                     )