refactor: rename code() to magic_id()

Author: dlachaume

internal/cardano-node/mithril-cardano-node-chain/src/chain_observer/pallas_observer.rs

@@ -56,7 +56,7 @@ impl PallasChainObserver {
 
     /// Creates and returns a new `NodeClient` connected to the specified socket.
     async fn new_client(&self) -> StdResult<NodeClient> {
-        let magic = self.network.code();
+        let magic = self.network.magic_id();
         let client = NodeClient::connect(&self.socket, magic).await?;
 
         Ok(client)

internal/cardano-node/mithril-cardano-node-chain/src/chain_reader/pallas_chain_reader.rs

@@ -38,7 +38,7 @@ impl PallasChainReader {
 
     /// Creates and returns a new `NodeClient` connected to the specified socket.
     async fn new_client(&self) -> StdResult<NodeClient> {
-        let magic = self.network.code();
+        let magic = self.network.magic_id();
         NodeClient::connect(&self.socket, magic)
             .await
             .map_err(|err| anyhow!(err))

internal/mithril-dmq/src/consumer/pallas.rs

@@ -45,7 +45,7 @@ impl<M: TryFromBytes + Debug> DmqConsumerPallas<M> {
             "socket" => ?self.socket,
             "network" => ?self.network
         );
-        DmqClient::connect(&self.socket, self.network.code())
+        DmqClient::connect(&self.socket, self.network.magic_id())
             .await
             .with_context(|| "DmqConsumerPallas failed to create a new client")
     }

internal/mithril-dmq/src/publisher/pallas.rs

@@ -40,7 +40,7 @@ impl<M: TryToBytes + Debug> DmqPublisherPallas<M> {
 
     /// Creates and returns a new `DmqClient` connected to the specified socket.
     async fn new_client(&self) -> StdResult<DmqClient> {
-        let magic = self.network.code();
+        let magic = self.network.magic_id();
         DmqClient::connect(&self.socket, magic)
             .await
             .with_context(|| "DmqPublisherPallas failed to create a new client")

mithril-client/src/utils/bootstrap_files.rs

@@ -23,7 +23,7 @@ pub fn create_bootstrap_node_files(
 
     if let Ok(network) = CardanoNetwork::from_code(network.to_string(), None) {
         let mut file = File::create(db_dir.join(PROTOCOL_MAGIC_ID_FILENAME))?;
-        file.write_all(format!("{}", network.code()).as_bytes())?;
+        file.write_all(format!("{}", network.magic_id()).as_bytes())?;
     };
 
     Ok(())
@@ -47,7 +47,7 @@ mod test {
 
         let file_content =
             std::fs::read_to_string(db_dir.join(PROTOCOL_MAGIC_ID_FILENAME)).unwrap();
-        assert_eq!(file_content, network.code().to_string());
+        assert_eq!(file_content, network.magic_id().to_string());
 
         assert!(db_dir.join(CLEAN_FILE_NAME).exists());
     }
@@ -63,7 +63,7 @@ mod test {
 
         let file_content =
             std::fs::read_to_string(db_dir.join(PROTOCOL_MAGIC_ID_FILENAME)).unwrap();
-        assert_eq!(file_content, network.code().to_string());
+        assert_eq!(file_content, network.magic_id().to_string());
 
         assert!(db_dir.join(CLEAN_FILE_NAME).exists());
     }
@@ -79,7 +79,7 @@ mod test {
 
         let file_content =
             std::fs::read_to_string(db_dir.join(PROTOCOL_MAGIC_ID_FILENAME)).unwrap();
-        assert_eq!(file_content, network.code().to_string());
+        assert_eq!(file_content, network.magic_id().to_string());
 
         assert!(db_dir.join(CLEAN_FILE_NAME).exists());
     }
@@ -96,7 +96,7 @@ mod test {
 
         let file_content =
             std::fs::read_to_string(db_dir.join(PROTOCOL_MAGIC_ID_FILENAME)).unwrap();
-        assert_eq!(file_content, network.code().to_string());
+        assert_eq!(file_content, network.magic_id().to_string());
 
         assert!(db_dir.join(CLEAN_FILE_NAME).exists());
     }

mithril-common/src/entities/cardano_network.rs

@@ -52,8 +52,8 @@ impl CardanoNetwork {
         }
     }
 
-    /// Returns the code (magic) of the network
-    pub fn code(&self) -> MagicId {
+    /// Returns the magic ID of the network
+    pub fn magic_id(&self) -> MagicId {
         match *self {
             CardanoNetwork::MainNet => MAINNET_MAGIC_ID,
             CardanoNetwork::TestNet(magic_id) => magic_id,
@@ -227,7 +227,7 @@ mod tests {
         fn assert_magic_id_conversion_roundtrip(magic_id: MagicId, expected: CardanoNetwork) {
             let network = CardanoNetwork::from(magic_id);
             assert_eq!(network, expected);
-            assert_eq!(network.code(), magic_id);
+            assert_eq!(network.magic_id(), magic_id);
         }
 
         assert_magic_id_conversion_roundtrip(MAINNET_MAGIC_ID, CardanoNetwork::MainNet);