unify currency pairs protobuf types

astriaorg · Jan 16, 2025 · 1180e60 · 1180e60
1 parent 04d93fd
commit 1180e60
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 168 deletions.
diff --git a/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs b/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs
diff --git a/crates/astria-core/src/generated/astria.protocol.transaction.v1.serde.rs b/crates/astria-core/src/generated/astria.protocol.transaction.v1.serde.rs
diff --git a/crates/astria-core/src/protocol/transaction/v1/action/mod.rs b/crates/astria-core/src/protocol/transaction/v1/action/mod.rs
@@ -2192,12 +2192,12 @@ impl Protobuf for CurrencyPairsChange {
     fn into_raw(self) -> Self::Raw {
         let raw = match self {
             CurrencyPairsChange::Addition(pairs) => {
-                raw::currency_pairs_change::Value::Addition(raw::CurrencyPairsToAdd {
+                raw::currency_pairs_change::Value::Addition(raw::CurrencyPairs {
                     pairs: pairs.into_iter().map(CurrencyPair::into_raw).collect(),
                 })
             }
             CurrencyPairsChange::Removal(pairs) => {
-                raw::currency_pairs_change::Value::Removal(raw::CurrencyPairsToRemove {
+                raw::currency_pairs_change::Value::Removal(raw::CurrencyPairs {
                     pairs: pairs.into_iter().map(CurrencyPair::into_raw).collect(),
                 })
             }
@@ -2220,7 +2220,7 @@ impl Protobuf for CurrencyPairsChange {
     /// - if any of the `pairs` field is invalid
     fn try_from_raw(raw: raw::CurrencyPairsChange) -> Result<Self, Self::Error> {
         match raw.value {
-            Some(raw::currency_pairs_change::Value::Addition(raw::CurrencyPairsToAdd {
+            Some(raw::currency_pairs_change::Value::Addition(raw::CurrencyPairs {
                 pairs,
             })) => {
                 let pairs = pairs
@@ -2230,7 +2230,7 @@ impl Protobuf for CurrencyPairsChange {
                     .map_err(Self::Error::invalid_currency_pair)?;
                 Ok(Self::Addition(pairs))
             }
-            Some(raw::currency_pairs_change::Value::Removal(raw::CurrencyPairsToRemove {
+            Some(raw::currency_pairs_change::Value::Removal(raw::CurrencyPairs {
                 pairs,
             })) => {
                 let pairs = pairs

diff --git a/proto/protocolapis/astria/protocol/transaction/v1/action.proto b/proto/protocolapis/astria/protocol/transaction/v1/action.proto
@@ -250,15 +250,11 @@ message PriceFeed {
 // Add or remove currency pairs to/from the price feed oracle.
 message CurrencyPairsChange {
   oneof value {
-    CurrencyPairsToAdd addition = 1;
-    CurrencyPairsToRemove removal = 2;
+    CurrencyPairs addition = 1;
+    CurrencyPairs removal = 2;
   }
 }
 
-message CurrencyPairsToAdd {
-  repeated connect.types.v2.CurrencyPair pairs = 1;
-}
-
-message CurrencyPairsToRemove {
+message CurrencyPairs {
   repeated connect.types.v2.CurrencyPair pairs = 1;
 }