[aptos-cli] Merge max gas and chain id into write options

Closes: aptos-labs#582

crates/aptos/src/account/create.rs

@@ -87,7 +87,7 @@ impl CreateAccount {
         let client = RestClient::new(reqwest::Url::clone(&self.write_options.rest_options.url));
         let transaction_factory = TransactionFactory::new(self.write_options.chain_id)
             .with_gas_unit_price(1)
-            .with_max_gas_amount(1000);
+            .with_max_gas_amount(self.write_options.max_gas);
         let sender_account = &mut LocalAccount::new(sender_address, sender_key, sequence_number);
         let transaction = sender_account.sign_with_transaction_builder(
             transaction_factory

crates/aptos/src/common/types.rs

@@ -352,6 +352,11 @@ pub struct WriteTransactionOptions {
     /// ChainId for the network
     #[clap(long)]
     pub chain_id: ChainId,
+    /// Maximum gas to be used to publish the package
+    ///
+    /// Defaults to 1000 gas units
+    #[clap(long, default_value_t = 1000)]
+    pub max_gas: u64,
 }
 
 /// Options for compiling a move package dir

crates/aptos/src/move_tool/mod.rs

@@ -125,14 +125,6 @@ pub struct PublishPackage {
     move_options: MovePackageDir,
     #[clap(flatten)]
     write_options: WriteTransactionOptions,
-    /// ChainId for the network
-    #[clap(long)]
-    chain_id: ChainId,
-    /// Maximum gas to be used to publish the package
-    ///
-    /// Defaults to 1000 gas units
-    #[clap(long, default_value_t = 1000)]
-    max_gas: u64,
 }
 
 impl PublishPackage {
@@ -160,10 +152,10 @@ impl PublishPackage {
 
         submit_transaction(
             self.write_options.rest_options.url.clone(),
-            self.chain_id,
+            self.write_options.chain_id,
             sender_key,
             compiled_payload,
-            self.max_gas,
+            self.write_options.max_gas,
         )
         .await
     }