diff --git a/sputnikdao-factory2/res/sputnikdao_factory2.wasm b/sputnikdao-factory2/res/sputnikdao_factory2.wasm index e605fac6..16bb2cbe 100755 Binary files a/sputnikdao-factory2/res/sputnikdao_factory2.wasm and b/sputnikdao-factory2/res/sputnikdao_factory2.wasm differ diff --git a/sputnikdao-factory2/src/factory_manager.rs b/sputnikdao-factory2/src/factory_manager.rs index ddd40aa5..5313645c 100644 --- a/sputnikdao-factory2/src/factory_manager.rs +++ b/sputnikdao-factory2/src/factory_manager.rs @@ -120,10 +120,8 @@ impl FactoryManager { env::promise_batch_action_create_account(promise_id); // Transfer attached deposit. env::promise_batch_action_transfer(promise_id, attached_deposit); - env::log_str("checking key"); if let Some(public_key) = public_key { // Add passed public key - env::log_str(format!("Adding key {:?}", public_key.as_str()).as_str()); env::promise_batch_action_add_key_with_full_access(promise_id, &PublicKey::from_str(public_key.as_str()).unwrap(), 0); } diff --git a/sputnikdao-factory2/tests/test_basics.rs b/sputnikdao-factory2/tests/test_basics.rs index 14e5fd0e..de51cf2f 100644 --- a/sputnikdao-factory2/tests/test_basics.rs +++ b/sputnikdao-factory2/tests/test_basics.rs @@ -106,11 +106,6 @@ async fn test_factory() -> Result<(), Box> { assert!(create_result.is_success()); - println!("{:?}", create_result); - println!( - "public key {}", - user_account.secret_key().public_key().to_string() - ); let dao_account_id: AccountId = format!("{}.{}", dao_name, SPUTNIKDAO_FACTORY_CONTRACT_ACCOUNT).parse().unwrap(); let dao_contract = Contract::from_secret_key( dao_account_id.clone(), @@ -129,14 +124,15 @@ async fn test_factory() -> Result<(), Box> { assert_eq!(create_dao_args["config"], config); let user_account_status_before_delete = user_account.view_account().await?; - assert_eq!(user_account_status_before_delete.balance, NearToken::from_yoctonear(93984722284196139773822472)); - + assert_eq!(user_account_status_before_delete.balance.as_near(), account_details_before.balance.saturating_sub(NearToken::from_near(7)).as_near()); + let delete_result = dao_contract.delete_contract(user_account.id()).await?; assert!(delete_result.is_success()); - println!("{:?}", delete_result); + + worker.fast_forward(10).await?; let user_account_status_after_delete = user_account.view_account().await?; - assert_eq!(user_account_status_after_delete.balance, account_details_before.balance); - + assert_eq!(user_account_status_after_delete.balance.as_near(), account_details_before.balance.saturating_sub(NearToken::from_near(1)).as_near()); + Ok(()) }