fix comments

crypto-org-chain · Jun 9, 2022 · 3ccc45e · 3ccc45e
1 parent 8559d28
commit 3ccc45e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,12 @@
 
 ### State Machine Breaking
 - [cronos#429](https://github.com/crypto-org-chain/cronos/pull/429) Update ethermint to main, ibc-go to v3.0.0, cosmos sdk to v0.45.4 and gravity to latest, remove v0.7.0 related upgradeHandler.
+- [cronos#532](https://github.com/crypto-org-chain/cronos/pull/532) Add SendtoChain and CancelSendToChain support from evm call.
 
 ### Improvements
 - [cronos#418](https://github.com/crypto-org-chain/cronos/pull/418) Support logs in evm-hooks and return id for SendToEthereum events
 - [cronos#489](https://github.com/crypto-org-chain/cronos/pull/489) Enable jemalloc memory allocator, and update rocksdb src to `v6.29.5`.
 - [cronos#511](https://github.com/crypto-org-chain/cronos/pull/511) Replace ibc-hook with ibc middleware, use ibc-go upstream version.
-- [cronos#532](https://github.com/crypto-org-chain/cronos/pull/532) Add SendtoChain and CancelSendToChain support from evm call.
 
 *May 3, 2022*
 

diff --git a/contracts/src/ModuleCRC20.sol b/contracts/src/ModuleCRC20.sol
@@ -38,7 +38,6 @@ contract ModuleCRC20 is DSToken  {
         unsafe_burn(addr, amount);
     }
 
-    // DEPRECATED: send to ethereum through gravity bridge
     function send_to_ethereum(address recipient, uint amount, uint bridge_fee) external {
         unsafe_burn(msg.sender, add(amount, bridge_fee));
         emit __CronosSendToEthereum(recipient, amount, bridge_fee);

diff --git a/integration_tests/test_gravity.py b/integration_tests/test_gravity.py
@@ -478,11 +478,9 @@ def check_fund():
         tx_id = get_id_from_receipt(txreceipt)
         assert txreceipt.status == 1, "should success"
 
-        def check_deduction():
-            v = crc21_contract.caller.balanceOf(ADDRS["community"])
-            return v == 0
-
-        wait_for_fn("check deduction", check_deduction)
+        # Check_deduction
+        balance_after_send = crc21_contract.caller.balanceOf(ADDRS["community"])
+        assert balance_after_send == 0
 
         # Cancel the send_to_chain
         canceltx = cancel_contract.functions.cancelTransaction(

diff --git a/x/cronos/keeper/evm.go b/x/cronos/keeper/evm.go
@@ -54,7 +54,7 @@ func (k Keeper) CallModuleCRC20(ctx sdk.Context, contract common.Address, method
 	return res.Ret, nil
 }
 
-// DeployModuleCRC21 deploy an embed erc20 contract
+// DeployModuleCRC21 deploy an embed crc21 contract
 func (k Keeper) DeployModuleCRC21(ctx sdk.Context, denom string) (common.Address, error) {
 	ctor, err := types.ModuleCRC21Contract.ABI.Pack("", denom, uint8(0))
 	if err != nil {

diff --git a/x/cronos/types/contracts/ModuleCRC20.json b/x/cronos/types/contracts/ModuleCRC20.json
diff --git a/x/cronos/types/contracts/ModuleCRC21.json b/x/cronos/types/contracts/ModuleCRC21.json