sdk/rust: shared accountant ModificationKind

cosmwasm/contracts/global-accountant/src/contract.rs

@@ -18,7 +18,9 @@ use serde_wormhole::RawMessage;
 use tinyvec::{Array, TinyVec};
 use wormhole_bindings::WormholeQuery;
 use wormhole_sdk::{
-    accountant as accountant_module, token,
+    accountant as accountant_module,
+    accountant_modification::ModificationKind,
+    token,
     vaa::{self, Body, Header, Signature},
     Chain,
 };
@@ -416,9 +418,9 @@ fn handle_accountant_governance_vaa(
         } => {
             let token_address = TokenAddress::new(token_address.0);
             let kind = match kind {
-                accountant_module::ModificationKind::Add => Kind::Add,
-                accountant_module::ModificationKind::Subtract => Kind::Sub,
-                accountant_module::ModificationKind::Unknown => {
+                ModificationKind::Add => Kind::Add,
+                ModificationKind::Subtract => Kind::Sub,
+                ModificationKind::Unknown => {
                     bail!("unsupported governance action")
                 }
             };

cosmwasm/contracts/global-accountant/tests/helpers/mod.rs

@@ -20,7 +20,8 @@ use global_accountant::{
 use serde::Serialize;
 use wormhole_bindings::{fake, WormholeQuery};
 use wormhole_sdk::{
-    accountant::{self as accountant_module, ModificationKind},
+    accountant as accountant_module,
+    accountant_modification::ModificationKind,
     token,
     vaa::{Body, Header, Signature},
     Address, Amount, Chain, Vaa,

cosmwasm/contracts/ntt-global-accountant/src/contract.rs

@@ -28,6 +28,7 @@ use tinyvec::{Array, TinyVec};
 use wormhole_bindings::WormholeQuery;
 use wormhole_io::TypePrefixedPayload;
 use wormhole_sdk::{
+    accountant_modification::ModificationKind,
     ntt_accountant as ntt_accountant_module, relayer,
     vaa::{self, Body, Header, Signature},
     Chain,
@@ -465,9 +466,9 @@ fn handle_accountant_governance_vaa(
         } => {
             let token_address = TokenAddress::new(token_address.0);
             let kind = match kind {
-                ntt_accountant_module::ModificationKind::Add => Kind::Add,
-                ntt_accountant_module::ModificationKind::Subtract => Kind::Sub,
-                ntt_accountant_module::ModificationKind::Unknown => {
+                ModificationKind::Add => Kind::Add,
+                ModificationKind::Subtract => Kind::Sub,
+                ModificationKind::Unknown => {
                     bail!("unsupported governance action")
                 }
             };

cosmwasm/contracts/ntt-global-accountant/tests/helpers/mod.rs

@@ -20,8 +20,8 @@ use ntt_global_accountant::{
 use serde::Serialize;
 use wormhole_bindings::{fake, WormholeQuery};
 use wormhole_sdk::{
-    ntt_accountant::{self as ntt_accountant_module, ModificationKind},
-    relayer,
+    accountant_modification::ModificationKind,
+    ntt_accountant as ntt_accountant_module, relayer,
     vaa::{Body, Header, Signature},
     Address, Amount, Chain, Vaa,
 };

sdk/rust/core/src/accountant.rs

@@ -4,55 +4,9 @@
 //! It needs a modify_balance message to be able to correct for unforeseen events.
 
 use bstr::BString;
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde::{Deserialize, Serialize};
 
-use crate::{Address, Amount, Chain};
-
-#[repr(u8)]
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Copy)]
-pub enum ModificationKind {
-    Unknown = 0,
-    Add = 1,
-    Subtract = 2,
-}
-
-impl From<u8> for ModificationKind {
-    fn from(other: u8) -> ModificationKind {
-        match other {
-            1 => ModificationKind::Add,
-            2 => ModificationKind::Subtract,
-            _ => ModificationKind::Unknown,
-        }
-    }
-}
-
-impl From<ModificationKind> for u8 {
-    fn from(other: ModificationKind) -> u8 {
-        match other {
-            ModificationKind::Unknown => 0,
-            ModificationKind::Add => 1,
-            ModificationKind::Subtract => 2,
-        }
-    }
-}
-
-impl Serialize for ModificationKind {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_u8((*self).into())
-    }
-}
-
-impl<'de> Deserialize<'de> for ModificationKind {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        <u8 as Deserialize>::deserialize(deserializer).map(Self::from)
-    }
-}
+use crate::{accountant_modification::ModificationKind, Address, Amount, Chain};
 
 /// Represents a governance action targeted at the Accountant.
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]

sdk/rust/core/src/accountant_modification.rs

@@ -0,0 +1,47 @@
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+#[repr(u8)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Copy)]
+pub enum ModificationKind {
+    Unknown = 0,
+    Add = 1,
+    Subtract = 2,
+}
+
+impl From<u8> for ModificationKind {
+    fn from(other: u8) -> ModificationKind {
+        match other {
+            1 => ModificationKind::Add,
+            2 => ModificationKind::Subtract,
+            _ => ModificationKind::Unknown,
+        }
+    }
+}
+
+impl From<ModificationKind> for u8 {
+    fn from(other: ModificationKind) -> u8 {
+        match other {
+            ModificationKind::Unknown => 0,
+            ModificationKind::Add => 1,
+            ModificationKind::Subtract => 2,
+        }
+    }
+}
+
+impl Serialize for ModificationKind {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_u8((*self).into())
+    }
+}
+
+impl<'de> Deserialize<'de> for ModificationKind {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        <u8 as Deserialize>::deserialize(deserializer).map(Self::from)
+    }
+}

sdk/rust/core/src/lib.rs

@@ -16,6 +16,7 @@ use std::fmt;
 use serde::{Deserialize, Serialize};
 
 pub mod accountant;
+pub mod accountant_modification;
 mod arraystring;
 mod chain;
 pub mod core;

sdk/rust/core/src/ntt_accountant.rs

@@ -4,55 +4,9 @@
 //! It needs a modify_balance message to be able to correct for unforeseen events.
 
 use bstr::BString;
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde::{Deserialize, Serialize};
 
-use crate::{Address, Amount, Chain};
-
-#[repr(u8)]
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Copy)]
-pub enum ModificationKind {
-    Unknown = 0,
-    Add = 1,
-    Subtract = 2,
-}
-
-impl From<u8> for ModificationKind {
-    fn from(other: u8) -> ModificationKind {
-        match other {
-            1 => ModificationKind::Add,
-            2 => ModificationKind::Subtract,
-            _ => ModificationKind::Unknown,
-        }
-    }
-}
-
-impl From<ModificationKind> for u8 {
-    fn from(other: ModificationKind) -> u8 {
-        match other {
-            ModificationKind::Unknown => 0,
-            ModificationKind::Add => 1,
-            ModificationKind::Subtract => 2,
-        }
-    }
-}
-
-impl Serialize for ModificationKind {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_u8((*self).into())
-    }
-}
-
-impl<'de> Deserialize<'de> for ModificationKind {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        <u8 as Deserialize>::deserialize(deserializer).map(Self::from)
-    }
-}
+use crate::{accountant_modification::ModificationKind, Address, Amount, Chain};
 
 /// Represents a governance action targeted at the Accountant.
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]