RM UserData from Transfer command and node service. (#2559)

* RM UserData from Transfer command and node service.

As a fallout, the burn & claim methods also loose the UserData.

* RM unused import behind feature flag

* Update docs and schemas after the removal.

Author: deuszx

CLI.md

@@ -140,7 +140,7 @@ A Byzantine-fault tolerant sidechain with low-latency finality and high throughp
 
 Transfer funds
 
-**Usage:** `linera transfer [OPTIONS] --from <SENDER> --to <RECIPIENT> <AMOUNT>`
+**Usage:** `linera transfer --from <SENDER> --to <RECIPIENT> <AMOUNT>`
 
 ###### **Arguments:**
 
@@ -150,7 +150,6 @@ Transfer funds
 
 * `--from <SENDER>` — Sending chain ID (must be one of our chains)
 * `--to <RECIPIENT>` — Recipient account
-* `--data <USER_DATA>` — User Data (should be a string whose bytes are at most 32 in length)
 
 
 

linera-chain/src/test.rs

@@ -89,7 +89,6 @@ impl BlockTestExt for Block {
             owner,
             recipient,
             amount,
-            user_data: Default::default(),
         })
     }
 

linera-chain/src/unit_tests/chain_tests.rs

@@ -17,7 +17,7 @@ use linera_base::{
 };
 use linera_execution::{
     committee::{Committee, Epoch, ValidatorName, ValidatorState},
-    system::{OpenChainConfig, Recipient, UserData},
+    system::{OpenChainConfig, Recipient},
     test_utils::{ExpectedCall, MockApplication},
     ExecutionError, ExecutionRuntimeConfig, ExecutionRuntimeContext, Message, MessageKind,
     Operation, ResourceControlPolicy, SystemMessage, SystemOperation, TestExecutionRuntimeContext,
@@ -153,7 +153,6 @@ async fn test_block_size_limit() {
             owner: None,
             recipient: Recipient::root(0),
             amount: Amount::ONE,
-            user_data: UserData::default(),
         });
     let result = chain.execute_block(&invalid_block, time, None).await;
     assert_matches!(

linera-client/src/client_context.rs

@@ -35,7 +35,7 @@ use {
     linera_core::data_types::ChainInfoQuery,
     linera_execution::{
         committee::Epoch,
-        system::{OpenChainConfig, Recipient, SystemOperation, UserData, OPEN_CHAIN_MESSAGE_INDEX},
+        system::{OpenChainConfig, Recipient, SystemOperation, OPEN_CHAIN_MESSAGE_INDEX},
         Operation,
     },
     linera_rpc::{
@@ -694,7 +694,6 @@ where
                     owner: None,
                     recipient: Recipient::chain(next_recipient),
                     amount,
-                    user_data: UserData::default(),
                 }),
             };
             let operations = iter::repeat(operation)

linera-client/src/client_options.rs

@@ -301,10 +301,6 @@ pub enum ClientCommand {
 
         /// Amount to transfer
         amount: Amount,
-
-        /// User Data (should be a string whose bytes are at most 32 in length)
-        #[arg(long = "data")]
-        user_data: Option<String>,
     },
 
     /// Open (i.e. activate) a new chain deriving the UID from an existing one.

linera-client/src/unit_tests/chain_listener.rs

@@ -18,10 +18,7 @@ use linera_core::{
     node::CrossChainMessageDelivery,
     test_utils::{MemoryStorageBuilder, NodeProvider, StorageBuilder as _, TestBuilder},
 };
-use linera_execution::{
-    system::{Recipient, UserData},
-    ResourceControlPolicy,
-};
+use linera_execution::{system::Recipient, ResourceControlPolicy};
 use linera_rpc::{
     config::{NetworkProtocol, ValidatorPublicNetworkPreConfig},
     simple::TransportProtocol,
@@ -189,9 +186,7 @@ async fn test_chain_listener() -> anyhow::Result<()> {
     // Transfer one token to chain 0. The listener should eventually become leader and receive
     // the message.
     let recipient0 = Recipient::chain(chain_id0);
-    client1
-        .transfer(None, Amount::ONE, recipient0, UserData::default())
-        .await?;
+    client1.transfer(None, Amount::ONE, recipient0).await?;
     for i in 0.. {
         client0.synchronize_from_validators().boxed().await?;
         let balance = client0.local_balance().await?;

linera-core/benches/client_benchmarks.rs

@@ -11,7 +11,7 @@ use linera_core::{
     client,
     test_utils::{MemoryStorageBuilder, NodeProvider, StorageBuilder, TestBuilder},
 };
-use linera_execution::system::{Recipient, UserData};
+use linera_execution::system::Recipient;
 use linera_storage::{
     READ_CERTIFICATE_COUNTER, READ_HASHED_CERTIFICATE_VALUE_COUNTER, WRITE_CERTIFICATE_COUNTER,
     WRITE_HASHED_CERTIFICATE_VALUE_COUNTER,
@@ -63,7 +63,7 @@ where
 
     let account = Account::owner(chain2.chain_id(), owner1);
     let cert = chain1
-        .transfer_to_account(None, amt, account, UserData(None))
+        .transfer_to_account(None, amt, account)
         .await
         .unwrap()
         .unwrap();
@@ -80,7 +80,7 @@ where
 
     let account = Recipient::chain(chain1.chain_id());
     let cert = chain1
-        .claim(owner1, chain2.chain_id(), account, amt, UserData(None))
+        .claim(owner1, chain2.chain_id(), account, amt)
         .await
         .unwrap()
         .unwrap();

linera-core/src/client/mod.rs

@@ -48,7 +48,7 @@ use linera_chain::{
 use linera_execution::{
     committee::{Committee, Epoch, ValidatorName},
     system::{
-        AdminOperation, OpenChainConfig, Recipient, SystemChannel, SystemOperation, UserData,
+        AdminOperation, OpenChainConfig, Recipient, SystemChannel, SystemOperation,
         CREATE_APPLICATION_MESSAGE_INDEX, OPEN_CHAIN_MESSAGE_INDEX,
     },
     ExecutionError, Message, Operation, Query, Response, SystemExecutionError, SystemMessage,
@@ -1287,20 +1287,18 @@ where
     }
 
     /// Sends money.
-    #[tracing::instrument(level = "trace", skip(user_data))]
+    #[tracing::instrument(level = "trace")]
     pub async fn transfer(
         &self,
         owner: Option<Owner>,
         amount: Amount,
         recipient: Recipient,
-        user_data: UserData,
     ) -> Result<ClientOutcome<Certificate>, ChainClientError> {
         // TODO(#467): check the balance of `owner` before signing any block proposal.
         self.execute_operation(Operation::System(SystemOperation::Transfer {
             owner,
             recipient,
             amount,
-            user_data,
         }))
         .await
     }
@@ -1321,21 +1319,19 @@ where
     }
 
     /// Claims money in a remote chain.
-    #[tracing::instrument(level = "trace", skip(user_data))]
+    #[tracing::instrument(level = "trace")]
     pub async fn claim(
         &self,
         owner: Owner,
         target_id: ChainId,
         recipient: Recipient,
         amount: Amount,
-        user_data: UserData,
     ) -> Result<ClientOutcome<Certificate>, ChainClientError> {
         self.execute_operation(Operation::System(SystemOperation::Claim {
             owner,
             target_id,
             recipient,
             amount,
-            user_data,
         }))
         .await
     }
@@ -2140,28 +2136,25 @@ where
     }
 
     /// Sends tokens to a chain.
-    #[tracing::instrument(level = "trace", skip(user_data))]
+    #[tracing::instrument(level = "trace")]
     pub async fn transfer_to_account(
         &self,
         owner: Option<Owner>,
         amount: Amount,
         account: Account,
-        user_data: UserData,
     ) -> Result<ClientOutcome<Certificate>, ChainClientError> {
-        self.transfer(owner, amount, Recipient::Account(account), user_data)
+        self.transfer(owner, amount, Recipient::Account(account))
             .await
     }
 
     /// Burns tokens.
-    #[tracing::instrument(level = "trace", skip(user_data))]
+    #[tracing::instrument(level = "trace")]
     pub async fn burn(
         &self,
         owner: Option<Owner>,
         amount: Amount,
-        user_data: UserData,
     ) -> Result<ClientOutcome<Certificate>, ChainClientError> {
-        self.transfer(owner, amount, Recipient::Burn, user_data)
-            .await
+        self.transfer(owner, amount, Recipient::Burn).await
     }
 
     /// Attempts to synchronize chains that have sent us messages and populate our local
@@ -2722,19 +2715,17 @@ where
     /// Sends money to a chain.
     /// Do not check balance. (This may block the client)
     /// Do not confirm the transaction.
-    #[tracing::instrument(level = "trace", skip(user_data))]
+    #[tracing::instrument(level = "trace")]
     pub async fn transfer_to_account_unsafe_unconfirmed(
         &self,
         owner: Option<Owner>,
         amount: Amount,
         account: Account,
-        user_data: UserData,
     ) -> Result<ClientOutcome<Certificate>, ChainClientError> {
         self.execute_operation(Operation::System(SystemOperation::Transfer {
             owner,
             recipient: Recipient::Account(account),
             amount,
-            user_data,
         }))
         .await
     }