fixing naming

golemfactory · Mar 7, 2024 · 0af5f3d · 0af5f3d
1 parent f08adc5
commit 0af5f3d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 19 deletions.
diff --git a/.github/workflows/allocation.yml b/.github/workflows/allocation.yml
@@ -66,17 +66,11 @@ jobs:
         run: |
           [ $(erc20_processor balance | jq -r ".\"$ETH_ADDRESS_1\".tokenDecimal") == "1000" ]
 
-      - name: Deposit 800.0 GLM tokens
-        run: |
-          erc20_processor deposit --account-no 1 --amount 800
-          erc20_processor run
-          erc20_processor balance
-
       - name: Create deposit
         run: |
           set -x 
-          erc20_processor make-deposit --account-no 1 --amount 1 --fee-amount 0.1 --block-for 0 --spender $ETH_ADDRESS_2 --deposit-id $DEPOSIT_ID0 --use-internal
-          erc20_processor make-deposit --account-no 1 --amount 1 --fee-amount 0.1 --block-for 1000 --spender $ETH_ADDRESS_2 --deposit-id $DEPOSIT_ID1 --use-internal
+          erc20_processor create-deposit --account-no 1 --amount 1 --fee-amount 0.1 --block-for 0 --spender $ETH_ADDRESS_2 --deposit-id $DEPOSIT_ID0 --use-internal
+          erc20_processor create-deposit --account-no 1 --amount 1 --fee-amount 0.1 --block-for 1000 --spender $ETH_ADDRESS_2 --deposit-id $DEPOSIT_ID1 --use-internal
           erc20_processor run
 
       - name: Check token balance zero

diff --git a/crates/erc20_payment_lib/src/runtime.rs b/crates/erc20_payment_lib/src/runtime.rs
@@ -1187,7 +1187,7 @@ pub async fn cancel_deposit(
     Ok(())
 }
 
-pub struct MakeDepositOptionsInt {
+pub struct CreateDepositOptionsInt {
     pub lock_contract_address: Address,
     pub spender: Address,
     pub skip_balance_check: bool,
@@ -1204,7 +1204,7 @@ pub async fn make_deposit(
     chain_id: u64,
     from: Address,
     glm_address: Address,
-    opt: MakeDepositOptionsInt,
+    opt: CreateDepositOptionsInt,
 ) -> Result<(), PaymentError> {
     let amount = if let Some(amount) = opt.amount {
         amount.to_u256_from_eth().map_err(err_from!())?

diff --git a/src/actions/create_deposit.rs b/src/actions/create_deposit.rs
@@ -2,7 +2,7 @@ use crate::actions::check_address_name;
 use erc20_payment_lib::config::Config;
 use erc20_payment_lib::eth::{deposit_id_from_nonce, check_allowance};
 use erc20_payment_lib::process_allowance;
-use erc20_payment_lib::runtime::{make_deposit, MakeDepositOptionsInt};
+use erc20_payment_lib::runtime::{make_deposit, CreateDepositOptionsInt};
 use erc20_payment_lib::setup::PaymentSetup;
 use erc20_payment_lib::signer::PrivateKeySigner;
 use erc20_payment_lib::utils::DecimalConvExt;
@@ -18,7 +18,7 @@ use web3::types::{Address, U256};
 
 #[derive(StructOpt)]
 #[structopt(about = "Allocate funds for use by payer")]
-pub struct MakeDepositOptions {
+pub struct CreateDepositOptions {
     #[structopt(short = "c", long = "chain-name", default_value = "holesky")]
     pub chain_name: String,
 
@@ -80,7 +80,7 @@ pub struct MakeDepositOptions {
 
 pub async fn make_deposit_local(
     conn: SqlitePool,
-    make_deposit_options: MakeDepositOptions,
+    make_deposit_options: CreateDepositOptions,
     config: Config,
     public_addrs: &[Address],
     signer: PrivateKeySigner,
@@ -196,7 +196,7 @@ pub async fn make_deposit_local(
         chain_cfg.chain_id as u64,
         public_addr,
         chain_cfg.token.address,
-        MakeDepositOptionsInt {
+        CreateDepositOptionsInt {
             lock_contract_address: chain_cfg
                 .lock_contract
                 .clone()

diff --git a/src/main.rs b/src/main.rs
@@ -71,7 +71,7 @@ async fn main_internal() -> Result<(), PaymentError> {
         PaymentCommands::CheckRpc { .. } => {}
         PaymentCommands::GetDevEth { .. } => {}
         PaymentCommands::MintTestTokens { .. } => {}
-        PaymentCommands::MakeDeposit { .. } => {}
+        PaymentCommands::CreateDeposit { .. } => {}
         PaymentCommands::CancelDeposit { .. } => {}
         PaymentCommands::CheckDeposit { .. } => {}
         PaymentCommands::Transfer { .. } => {}
@@ -350,7 +350,7 @@ async fn main_internal() -> Result<(), PaymentError> {
             )
             .await?;
         }
-        PaymentCommands::MakeDeposit {
+        PaymentCommands::CreateDeposit {
             make_deposit_options,
         } => {
             make_deposit_local(

diff --git a/src/options.rs b/src/options.rs
@@ -1,7 +1,7 @@
 use std::{fmt::Debug, path::PathBuf};
 
 use crate::actions::cancel_deposit::CancelDepositOptions;
-use crate::actions::create_deposit::MakeDepositOptions;
+use crate::actions::create_deposit::CreateDepositOptions;
 use erc20_payment_lib_extra::{BalanceOptions, GenerateOptions};
 use structopt::StructOpt;
 use web3::types::Address;
@@ -394,9 +394,9 @@ pub enum PaymentCommands {
         #[structopt(flatten)]
         mint_test_tokens_options: MintTestTokensOptions,
     },
-    MakeDeposit {
+    CreateDeposit {
         #[structopt(flatten)]
-        make_deposit_options: MakeDepositOptions,
+        make_deposit_options: CreateDepositOptions,
     },
     CancelDeposit {
         #[structopt(flatten)]