cleaner way

DeFiCh · Jun 15, 2023 · 55b33df · 55b33df
1 parent 1bf9a24
commit 55b33df
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/ain-grpc/src/transaction_request.rs b/lib/ain-grpc/src/transaction_request.rs
@@ -58,8 +58,9 @@ impl From<TransactionRequest> for Option<TransactionMessage> {
                 value: req.value.unwrap_or_default(),
                 input: req
                     .input
+                    .or_else(||req.data)
                     .map(Bytes::into_vec)
-                    .unwrap_or(req.data.map(Bytes::into_vec).unwrap_or_default()),
+                    .unwrap_or_default(),
                 action: match req.to {
                     Some(to) => ethereum::TransactionAction::Call(to),
                     None => ethereum::TransactionAction::Create,
@@ -74,8 +75,9 @@ impl From<TransactionRequest> for Option<TransactionMessage> {
                 value: req.value.unwrap_or_default(),
                 input: req
                     .input
+                    .or_else(||req.data)
                     .map(Bytes::into_vec)
-                    .unwrap_or(req.data.map(Bytes::into_vec).unwrap_or_default()),
+                    .unwrap_or_default(),
                 action: match req.to {
                     Some(to) => ethereum::TransactionAction::Call(to),
                     None => ethereum::TransactionAction::Create,
@@ -94,8 +96,9 @@ impl From<TransactionRequest> for Option<TransactionMessage> {
                     value: req.value.unwrap_or_default(),
                     input: req
                         .input
+                        .or_else(||req.data)
                         .map(Bytes::into_vec)
-                        .unwrap_or(req.data.map(Bytes::into_vec).unwrap_or_default()),
+                        .unwrap_or_default(),
                     action: match req.to {
                         Some(to) => ethereum::TransactionAction::Call(to),
                         None => ethereum::TransactionAction::Create,