Replaced code field of message Tx with code_hash.

anoma · Jan 31, 2023 · c281592 · c281592
1 parent e7f1e42
commit c281592
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/core/src/proto/types.rs b/core/src/proto/types.rs
@@ -231,11 +231,7 @@ impl TryFrom<&[u8]> for Tx {
             ),
             None => None,
         };
-        let code = if tx.is_literal {
-            TxCode::Literal(tx.code)
-        } else {
-            TxCode::Hash(tx.code.try_into().expect("Unable to deserialize code hash"))
-        };
+        let code =  TxCode::Hash(tx.code_hash.try_into().expect("Unable to deserialize code hash"));
         Ok(Tx {
             code,
             data: tx.data,
@@ -261,8 +257,7 @@ impl From<Tx> for types::Tx {
         };
 
         types::Tx {
-            code: tx.code.code().unwrap_or(tx.code.code_hash().to_vec()),
-            is_literal: tx.code.is_literal(),
+            code_hash: tx.code.code_hash().to_vec(),
             data: tx.data,
             timestamp,
             inner_tx,
@@ -402,8 +397,7 @@ impl Tx {
         let timestamp = Some(self.timestamp.into());
         let mut bytes = vec![];
         types::Tx {
-            code: self.code.code_hash().to_vec(),
-            is_literal: false,
+            code_hash: self.code.code_hash().to_vec(),
             data: self.data.clone(),
             timestamp,
             inner_tx: None,

diff --git a/core/src/types/transaction/wrapper.rs b/core/src/types/transaction/wrapper.rs
@@ -18,7 +18,7 @@ pub mod wrapper_tx {
     use crate::types::token::Amount;
     use crate::types::transaction::encrypted::EncryptedTx;
     use crate::types::transaction::{
-        hash_tx, Hash, TxError, TxType,
+        Hash, TxError, TxType,
     };
 
     /// Minimum fee amount in micro NAMs

diff --git a/proto/types.proto b/proto/types.proto
@@ -5,13 +5,12 @@ import "google/protobuf/timestamp.proto";
 package types;
 
 message Tx {
-  bytes code = 1;
+  bytes code_hash = 1;
   // TODO this optional is useless because it's default on proto3
   optional bytes data = 2;
   google.protobuf.Timestamp timestamp = 3;
   optional bytes inner_tx = 4;
   optional bytes inner_tx_code = 5;
-  bool is_literal = 6;
 }
 
 message Dkg { string data = 1; }