From 9875dfbdbecf1371322c21a6558fccad349827e1 Mon Sep 17 00:00:00 2001
From: Gyubong <jopemachine@naver.com>
Date: Wed, 3 Jan 2024 13:15:21 +0900
Subject: [PATCH] Clean up imports

---
 binding/python/Makefile                                     | 3 ---
 binding/python/src/bindings/deserializer.rs                 | 5 ++---
 binding/python/src/bindings/peers.rs                        | 2 +-
 .../src/bindings/raft_rs/eraftpb/conf_change_single.rs      | 3 +--
 .../python/src/bindings/raft_rs/eraftpb/conf_change_type.rs | 2 +-
 .../python/src/bindings/raft_rs/eraftpb/conf_change_v2.rs   | 5 ++---
 binding/python/src/bindings/raft_rs/eraftpb/entry.rs        | 6 ++----
 binding/python/src/bindings/raft_rs/eraftpb/entry_type.rs   | 2 +-
 binding/python/src/bindings/raft_rs/eraftpb/message.rs      | 3 +--
 binding/python/src/bindings/raft_rs/eraftpb/message_type.rs | 2 +-
 10 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/binding/python/Makefile b/binding/python/Makefile
index 7e299b1f..3dc3c4eb 100644
--- a/binding/python/Makefile
+++ b/binding/python/Makefile
@@ -17,9 +17,6 @@ install-release:
 clean:
 	cargo clean
 
-test:
-	python -m pytest
-
 fmt:
 	cargo fmt
 
diff --git a/binding/python/src/bindings/deserializer.rs b/binding/python/src/bindings/deserializer.rs
index 521f571b..16c6475e 100644
--- a/binding/python/src/bindings/deserializer.rs
+++ b/binding/python/src/bindings/deserializer.rs
@@ -2,12 +2,11 @@ use std::sync::Mutex;
 
 use once_cell::sync::Lazy;
 use prost::Message as PMessage;
-use pyo3::prelude::*;
-use pyo3::{types::PyBytes, PyObject, Python};
-use raftify::raft::derializer::{format_confchange, format_confchangev2};
+use pyo3::{prelude::*, types::PyBytes, PyObject, Python};
 use raftify::raft::{
     derializer::{Bytes, CustomDeserializer},
     eraftpb::{ConfChange, ConfChangeV2},
+    derializer::{format_confchange, format_confchangev2},
 };
 
 pub struct PythonDeserializer;
diff --git a/binding/python/src/bindings/peers.rs b/binding/python/src/bindings/peers.rs
index 9a66f7d5..2c477835 100644
--- a/binding/python/src/bindings/peers.rs
+++ b/binding/python/src/bindings/peers.rs
@@ -9,7 +9,7 @@ use std::{collections::HashMap, hash::BuildHasherDefault};
 use super::utils::new_py_list;
 
 #[derive(Clone)]
-#[pyclass(name = "Peers")]
+#[pyclass(dict, name = "Peers")]
 pub struct PyPeers {
     pub inner: Peers,
 }
diff --git a/binding/python/src/bindings/raft_rs/eraftpb/conf_change_single.rs b/binding/python/src/bindings/raft_rs/eraftpb/conf_change_single.rs
index 29ff6bf9..9a8bab7e 100644
--- a/binding/python/src/bindings/raft_rs/eraftpb/conf_change_single.rs
+++ b/binding/python/src/bindings/raft_rs/eraftpb/conf_change_single.rs
@@ -1,5 +1,4 @@
-use pyo3::prelude::*;
-use pyo3::types::PyDict;
+use pyo3::{prelude::*, types::PyDict};
 use raftify::raft::eraftpb::ConfChangeSingle;
 
 use super::conf_change_type::PyConfChangeType;
diff --git a/binding/python/src/bindings/raft_rs/eraftpb/conf_change_type.rs b/binding/python/src/bindings/raft_rs/eraftpb/conf_change_type.rs
index ac9fc440..ce41c972 100644
--- a/binding/python/src/bindings/raft_rs/eraftpb/conf_change_type.rs
+++ b/binding/python/src/bindings/raft_rs/eraftpb/conf_change_type.rs
@@ -2,7 +2,7 @@ use pyo3::{exceptions::PyException, prelude::*, pyclass::CompareOp};
 use raftify::raft::eraftpb::ConfChangeType;
 
 #[derive(Clone)]
-#[pyclass(name = "ConfChangeType")]
+#[pyclass(frozen, name = "ConfChangeType")]
 pub struct PyConfChangeType(pub ConfChangeType);
 
 impl From<PyConfChangeType> for ConfChangeType {
diff --git a/binding/python/src/bindings/raft_rs/eraftpb/conf_change_v2.rs b/binding/python/src/bindings/raft_rs/eraftpb/conf_change_v2.rs
index 2d949a4e..1539aa12 100644
--- a/binding/python/src/bindings/raft_rs/eraftpb/conf_change_v2.rs
+++ b/binding/python/src/bindings/raft_rs/eraftpb/conf_change_v2.rs
@@ -1,10 +1,9 @@
-use pyo3::types::PyDict;
 use pyo3::{
     prelude::*,
     types::{PyBytes, PyList},
+    types::PyDict,
 };
-use raftify::raft::derializer::format_confchangev2;
-use raftify::raft::eraftpb::ConfChangeV2;
+use raftify::raft::{derializer::format_confchangev2, eraftpb::ConfChangeV2};
 
 use super::{
     conf_change_single::PyConfChangeSingle, conf_change_transition::PyConfChangeTransition,
diff --git a/binding/python/src/bindings/raft_rs/eraftpb/entry.rs b/binding/python/src/bindings/raft_rs/eraftpb/entry.rs
index 32456670..3bbf0d9e 100644
--- a/binding/python/src/bindings/raft_rs/eraftpb/entry.rs
+++ b/binding/python/src/bindings/raft_rs/eraftpb/entry.rs
@@ -1,7 +1,5 @@
-use pyo3::prelude::*;
-use pyo3::types::{PyBytes, PyDict};
-use raftify::raft::derializer::format_entry;
-use raftify::raft::eraftpb::Entry;
+use pyo3::{prelude::*, types::{PyBytes, PyDict}};
+use raftify::raft::{derializer::format_entry, eraftpb::Entry};
 
 use super::entry_type::PyEntryType;
 
diff --git a/binding/python/src/bindings/raft_rs/eraftpb/entry_type.rs b/binding/python/src/bindings/raft_rs/eraftpb/entry_type.rs
index f58c9bbd..07dfdf91 100644
--- a/binding/python/src/bindings/raft_rs/eraftpb/entry_type.rs
+++ b/binding/python/src/bindings/raft_rs/eraftpb/entry_type.rs
@@ -2,7 +2,7 @@ use pyo3::{exceptions::PyRuntimeError, prelude::*, pyclass::CompareOp};
 use raftify::raft::eraftpb::EntryType;
 
 #[derive(Clone)]
-#[pyclass(name = "EntryType")]
+#[pyclass(frozen, name = "EntryType")]
 pub struct PyEntryType(pub EntryType);
 
 impl From<PyEntryType> for EntryType {
diff --git a/binding/python/src/bindings/raft_rs/eraftpb/message.rs b/binding/python/src/bindings/raft_rs/eraftpb/message.rs
index 29010c23..fd2f9483 100644
--- a/binding/python/src/bindings/raft_rs/eraftpb/message.rs
+++ b/binding/python/src/bindings/raft_rs/eraftpb/message.rs
@@ -2,8 +2,7 @@ use pyo3::{
     prelude::*,
     types::{PyBytes, PyList},
 };
-use raftify::raft::derializer::format_message;
-use raftify::raft::eraftpb::Message;
+use raftify::raft::{derializer::format_message, eraftpb::Message};
 
 use super::{entry::PyEntry, message_type::PyMessageType};
 
diff --git a/binding/python/src/bindings/raft_rs/eraftpb/message_type.rs b/binding/python/src/bindings/raft_rs/eraftpb/message_type.rs
index 306fcb05..750b168e 100644
--- a/binding/python/src/bindings/raft_rs/eraftpb/message_type.rs
+++ b/binding/python/src/bindings/raft_rs/eraftpb/message_type.rs
@@ -2,7 +2,7 @@ use pyo3::{exceptions::PyRuntimeError, prelude::*, pyclass::CompareOp};
 use raftify::raft::eraftpb::MessageType;
 
 #[derive(Clone)]
-#[pyclass(name = "MessageType")]
+#[pyclass(frozen, name = "MessageType")]
 pub struct PyMessageType(pub MessageType);
 
 impl From<PyMessageType> for MessageType {