From dd95954fc3f535b7736ab45c31de6ac4bb7e00d6 Mon Sep 17 00:00:00 2001 From: Chirantan Ekbote Date: Wed, 18 Jan 2023 18:06:13 +0900 Subject: [PATCH] cosmwasm: Rename accounting -> accountant Also change wormchain -> global. --- cosmwasm/Cargo.lock | 54 +++++++++---------- cosmwasm/Cargo.toml | 8 +-- .../Cargo.toml | 4 +- .../examples/global_accountant_schema.rs} | 2 +- .../schema/global-accountant.json} | 2 +- .../src/contract.rs | 24 ++++----- .../src/error.rs | 0 .../src/lib.rs | 0 .../src/msg.rs | 2 +- .../src/state.rs | 2 +- .../tests/chain_registration.rs | 2 +- .../tests/helpers/mod.rs | 18 +++---- .../tests/missing_observations.rs | 4 +- .../tests/modify_balance.rs | 2 +- .../tests/query.rs | 4 +- .../tests/submit_observations.rs | 4 +- .../tests/submit_vaas.rs | 4 +- .../tests/upgrade_contract.rs | 2 +- cosmwasm/deployment/terra2/tools/deploy.js | 2 +- .../{accounting => accountant}/Cargo.toml | 2 +- .../src/contract.rs | 8 +-- .../{accounting => accountant}/src/lib.rs | 0 .../{accounting => accountant}/src/msg.rs | 0 .../{accounting => accountant}/src/state.rs | 6 +-- .../src/state/account.rs | 0 .../src/state/addr.rs | 0 .../src/state/transfer.rs | 0 27 files changed, 78 insertions(+), 78 deletions(-) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/Cargo.toml (95%) rename cosmwasm/contracts/{wormchain-accounting/examples/wormchain_accounting_schema.rs => global-accountant/examples/global_accountant_schema.rs} (76%) rename cosmwasm/contracts/{wormchain-accounting/schema/wormchain-accounting.json => global-accountant/schema/global-accountant.json} (99%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/src/contract.rs (97%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/src/error.rs (100%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/src/lib.rs (100%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/src/msg.rs (99%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/src/state.rs (98%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/tests/chain_registration.rs (98%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/tests/helpers/mod.rs (96%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/tests/missing_observations.rs (99%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/tests/modify_balance.rs (99%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/tests/query.rs (99%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/tests/submit_observations.rs (99%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/tests/submit_vaas.rs (98%) rename cosmwasm/contracts/{wormchain-accounting => global-accountant}/tests/upgrade_contract.rs (97%) rename cosmwasm/packages/{accounting => accountant}/Cargo.toml (97%) rename cosmwasm/packages/{accounting => accountant}/src/contract.rs (99%) rename cosmwasm/packages/{accounting => accountant}/src/lib.rs (100%) rename cosmwasm/packages/{accounting => accountant}/src/msg.rs (100%) rename cosmwasm/packages/{accounting => accountant}/src/state.rs (94%) rename cosmwasm/packages/{accounting => accountant}/src/state/account.rs (100%) rename cosmwasm/packages/{accounting => accountant}/src/state/addr.rs (100%) rename cosmwasm/packages/{accounting => accountant}/src/state/transfer.rs (100%) diff --git a/cosmwasm/Cargo.lock b/cosmwasm/Cargo.lock index ee76cacdc..216dcf2b3 100644 --- a/cosmwasm/Cargo.lock +++ b/cosmwasm/Cargo.lock @@ -3,7 +3,7 @@ version = 3 [[package]] -name = "accounting" +name = "accountant" version = "0.1.0" dependencies = [ "anyhow", @@ -926,6 +926,32 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +[[package]] +name = "global-accountant" +version = "0.1.0" +dependencies = [ + "accountant", + "anyhow", + "base64", + "cosmwasm-schema", + "cosmwasm-std", + "cosmwasm-storage", + "cw-multi-test", + "cw-storage-plus", + "cw2", + "cw_transcode", + "hex", + "schemars", + "serde", + "serde-json-wasm", + "serde_wormhole", + "thiserror", + "tinyvec", + "token-bridge-terra-2", + "wormhole-bindings", + "wormhole-core", +] + [[package]] name = "group" version = "0.10.0" @@ -2247,32 +2273,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "wormchain-accounting" -version = "0.1.0" -dependencies = [ - "accounting", - "anyhow", - "base64", - "cosmwasm-schema", - "cosmwasm-std", - "cosmwasm-storage", - "cw-multi-test", - "cw-storage-plus", - "cw2", - "cw_transcode", - "hex", - "schemars", - "serde", - "serde-json-wasm", - "serde_wormhole", - "thiserror", - "tinyvec", - "token-bridge-terra-2", - "wormhole-bindings", - "wormhole-core", -] - [[package]] name = "wormhole-bindings" version = "0.1.0" diff --git a/cosmwasm/Cargo.toml b/cosmwasm/Cargo.toml index a1b386c15..66f916f07 100644 --- a/cosmwasm/Cargo.toml +++ b/cosmwasm/Cargo.toml @@ -6,8 +6,8 @@ members = [ "contracts/token-bridge", "contracts/shutdown-token-bridge", "contracts/mock-bridge-integration", - "packages/accounting", - "contracts/wormchain-accounting", + "packages/accountant", + "contracts/global-accountant", "packages/wormhole-bindings", "packages/cw_transcode", ] @@ -28,12 +28,12 @@ incremental = false overflow-checks = true [patch.crates-io] -accounting = { path = "packages/accounting" } +accountant = { path = "packages/accountant" } cw_transcode = { path = "packages/cw_transcode" } cw20-wrapped-2 = { path = "contracts/cw20-wrapped" } serde_wormhole = { path = "../sdk/rust/serde_wormhole" } token-bridge-terra-2 = { path = "contracts/token-bridge" } -wormchain-accounting = { path = "contracts/wormchain-accounting" } +global-accountant = { path = "contracts/global-accountant" } wormhole-bindings = { path = "packages/wormhole-bindings" } wormhole-bridge-terra-2 = { path = "contracts/wormhole" } wormhole-core = { path = "../sdk/rust/core" } diff --git a/cosmwasm/contracts/wormchain-accounting/Cargo.toml b/cosmwasm/contracts/global-accountant/Cargo.toml similarity index 95% rename from cosmwasm/contracts/wormchain-accounting/Cargo.toml rename to cosmwasm/contracts/global-accountant/Cargo.toml index ddf646b3a..e4d7044d4 100644 --- a/cosmwasm/contracts/wormchain-accounting/Cargo.toml +++ b/cosmwasm/contracts/global-accountant/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wormchain-accounting" +name = "global-accountant" version = "0.1.0" authors = ["Wormhole Project Contributors"] edition = "2021" @@ -13,7 +13,7 @@ backtraces = ["cosmwasm-std/backtraces"] library = [] [dependencies] -accounting = "0.1.0" +accountant = "0.1.0" anyhow = "1" base64 = "0.13" cosmwasm-schema = "1" diff --git a/cosmwasm/contracts/wormchain-accounting/examples/wormchain_accounting_schema.rs b/cosmwasm/contracts/global-accountant/examples/global_accountant_schema.rs similarity index 76% rename from cosmwasm/contracts/wormchain-accounting/examples/wormchain_accounting_schema.rs rename to cosmwasm/contracts/global-accountant/examples/global_accountant_schema.rs index 980b62a18..5bcb9a600 100644 --- a/cosmwasm/contracts/wormchain-accounting/examples/wormchain_accounting_schema.rs +++ b/cosmwasm/contracts/global-accountant/examples/global_accountant_schema.rs @@ -1,7 +1,7 @@ use cosmwasm_schema::write_api; use cosmwasm_std::Empty; -use wormchain_accounting::msg::{ExecuteMsg, QueryMsg}; +use global_accountant::msg::{ExecuteMsg, QueryMsg}; fn main() { write_api! { diff --git a/cosmwasm/contracts/wormchain-accounting/schema/wormchain-accounting.json b/cosmwasm/contracts/global-accountant/schema/global-accountant.json similarity index 99% rename from cosmwasm/contracts/wormchain-accounting/schema/wormchain-accounting.json rename to cosmwasm/contracts/global-accountant/schema/global-accountant.json index 51a6ca760..b6f6d98a8 100644 --- a/cosmwasm/contracts/wormchain-accounting/schema/wormchain-accounting.json +++ b/cosmwasm/contracts/global-accountant/schema/global-accountant.json @@ -1,5 +1,5 @@ { - "contract_name": "wormchain-accounting", + "contract_name": "global-accountant", "contract_version": "0.1.0", "idl_version": "1.0.0", "instantiate": { diff --git a/cosmwasm/contracts/wormchain-accounting/src/contract.rs b/cosmwasm/contracts/global-accountant/src/contract.rs similarity index 97% rename from cosmwasm/contracts/wormchain-accounting/src/contract.rs rename to cosmwasm/contracts/global-accountant/src/contract.rs index 194004a43..e91e05c47 100644 --- a/cosmwasm/contracts/wormchain-accounting/src/contract.rs +++ b/cosmwasm/contracts/global-accountant/src/contract.rs @@ -1,6 +1,6 @@ use std::marker::PhantomData; -use accounting::{ +use accountant::{ query_balance, query_modification, state::{account, transfer, Modification, TokenAddress, Transfer}, validate_transfer, @@ -37,7 +37,7 @@ use crate::{ }; // version info for migration info -const CONTRACT_NAME: &str = "crates.io:wormchain-accounting"; +const CONTRACT_NAME: &str = "crates.io:global-accountant"; const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION"); #[cfg_attr(not(feature = "library"), entry_point)] @@ -241,7 +241,7 @@ fn handle_observation( "unknown emitter address" ); - accounting::commit_transfer( + accountant::commit_transfer( deps.branch(), Transfer { key: tx_key, @@ -287,7 +287,7 @@ fn modify_balance( let msg: Modification = from_binary(&modification).context("failed to parse `Modification`")?; let event = - accounting::modify_balance(deps, msg).context("failed to modify account balance")?; + accountant::modify_balance(deps, msg).context("failed to modify account balance")?; Ok(Response::new() .add_attribute("action", "modify_balance") @@ -471,7 +471,7 @@ fn handle_tokenbridge_vaa( key: key.clone(), data, }; - let evt = accounting::commit_transfer(deps.branch(), tx) + let evt = accountant::commit_transfer(deps.branch(), tx) .with_context(|| format!("failed to commit transfer for key {key}"))?; PENDING_TRANSFERS.remove(deps.storage, key); @@ -532,12 +532,12 @@ fn query_all_accounts( let l = lim .try_into() .map_err(|_| ConversionOverflowError::new("u32", "usize", lim.to_string()))?; - accounting::query_all_accounts(deps, start_after) + accountant::query_all_accounts(deps, start_after) .take(l) .collect::>>() .map(|accounts| AllAccountsResponse { accounts }) } else { - accounting::query_all_accounts(deps, start_after) + accountant::query_all_accounts(deps, start_after) .collect::>>() .map(|accounts| AllAccountsResponse { accounts }) } @@ -552,7 +552,7 @@ fn query_all_transfers( let l = lim .try_into() .map_err(|_| ConversionOverflowError::new("u32", "usize", lim.to_string()))?; - accounting::query_all_transfers(deps, start_after) + accountant::query_all_transfers(deps, start_after) .map(|res| { res.and_then(|t| { let digest = DIGESTS.load( @@ -571,7 +571,7 @@ fn query_all_transfers( .collect::>>() .map(|transfers| AllTransfersResponse { transfers }) } else { - accounting::query_all_transfers(deps, start_after) + accountant::query_all_transfers(deps, start_after) .map(|res| { res.and_then(|t| { let digest = DIGESTS.load( @@ -637,12 +637,12 @@ fn query_all_modifications( let l = lim .try_into() .map_err(|_| ConversionOverflowError::new("u32", "usize", lim.to_string()))?; - accounting::query_all_modifications(deps, start_after) + accountant::query_all_modifications(deps, start_after) .take(l) .collect::>>() .map(|modifications| AllModificationsResponse { modifications }) } else { - accounting::query_all_modifications(deps, start_after) + accountant::query_all_modifications(deps, start_after) .collect::>>() .map(|modifications| AllModificationsResponse { modifications }) } @@ -690,7 +690,7 @@ fn query_transfer_status( key.sequence(), ), )? { - let data = accounting::query_transfer(deps, key.clone())?; + let data = accountant::query_transfer(deps, key.clone())?; Ok(TransferStatus::Committed { data, digest }) } else if let Some(data) = PENDING_TRANSFERS.may_load(deps.storage, key.clone())? { Ok(TransferStatus::Pending(tinyvec_to_vec(data))) diff --git a/cosmwasm/contracts/wormchain-accounting/src/error.rs b/cosmwasm/contracts/global-accountant/src/error.rs similarity index 100% rename from cosmwasm/contracts/wormchain-accounting/src/error.rs rename to cosmwasm/contracts/global-accountant/src/error.rs diff --git a/cosmwasm/contracts/wormchain-accounting/src/lib.rs b/cosmwasm/contracts/global-accountant/src/lib.rs similarity index 100% rename from cosmwasm/contracts/wormchain-accounting/src/lib.rs rename to cosmwasm/contracts/global-accountant/src/lib.rs diff --git a/cosmwasm/contracts/wormchain-accounting/src/msg.rs b/cosmwasm/contracts/global-accountant/src/msg.rs similarity index 99% rename from cosmwasm/contracts/wormchain-accounting/src/msg.rs rename to cosmwasm/contracts/global-accountant/src/msg.rs index c4b849490..e0733b82e 100644 --- a/cosmwasm/contracts/wormchain-accounting/src/msg.rs +++ b/cosmwasm/contracts/global-accountant/src/msg.rs @@ -1,4 +1,4 @@ -use accounting::state::{account, transfer, Account, Modification, Transfer}; +use accountant::state::{account, transfer, Account, Modification, Transfer}; use cosmwasm_schema::{cw_serde, QueryResponses}; use cosmwasm_std::Binary; use serde_wormhole::RawMessage; diff --git a/cosmwasm/contracts/wormchain-accounting/src/state.rs b/cosmwasm/contracts/global-accountant/src/state.rs similarity index 98% rename from cosmwasm/contracts/wormchain-accounting/src/state.rs rename to cosmwasm/contracts/global-accountant/src/state.rs index 33309b8f8..ca681efd1 100644 --- a/cosmwasm/contracts/wormchain-accounting/src/state.rs +++ b/cosmwasm/contracts/global-accountant/src/state.rs @@ -1,4 +1,4 @@ -use accounting::state::transfer; +use accountant::state::transfer; use cosmwasm_schema::cw_serde; use cosmwasm_std::Binary; use cw_storage_plus::Map; diff --git a/cosmwasm/contracts/wormchain-accounting/tests/chain_registration.rs b/cosmwasm/contracts/global-accountant/tests/chain_registration.rs similarity index 98% rename from cosmwasm/contracts/wormchain-accounting/tests/chain_registration.rs rename to cosmwasm/contracts/global-accountant/tests/chain_registration.rs index 9bf63ca32..4a5092d10 100644 --- a/cosmwasm/contracts/wormchain-accounting/tests/chain_registration.rs +++ b/cosmwasm/contracts/global-accountant/tests/chain_registration.rs @@ -1,8 +1,8 @@ mod helpers; use cosmwasm_std::{to_binary, Event}; +use global_accountant::msg::ChainRegistrationResponse; use helpers::*; -use wormchain_accounting::msg::ChainRegistrationResponse; use wormhole::{ token::{Action, GovernancePacket}, vaa::Body, diff --git a/cosmwasm/contracts/wormchain-accounting/tests/helpers/mod.rs b/cosmwasm/contracts/global-accountant/tests/helpers/mod.rs similarity index 96% rename from cosmwasm/contracts/wormchain-accounting/tests/helpers/mod.rs rename to cosmwasm/contracts/global-accountant/tests/helpers/mod.rs index 4b2492a64..4a1ac6c46 100644 --- a/cosmwasm/contracts/wormchain-accounting/tests/helpers/mod.rs +++ b/cosmwasm/contracts/global-accountant/tests/helpers/mod.rs @@ -1,6 +1,6 @@ #![allow(dead_code)] -use accounting::state::{account, transfer, Modification}; +use accountant::state::{account, transfer, Modification}; use cosmwasm_schema::cw_serde; use cosmwasm_std::{ testing::{MockApi, MockStorage}, @@ -9,8 +9,7 @@ use cosmwasm_std::{ use cw_multi_test::{ App, AppBuilder, AppResponse, BankKeeper, ContractWrapper, Executor, WasmKeeper, }; -use serde::Serialize; -use wormchain_accounting::{ +use global_accountant::{ msg::{ AllAccountsResponse, AllModificationsResponse, AllPendingTransfersResponse, AllTransfersResponse, BatchTransferStatusResponse, ChainRegistrationResponse, ExecuteMsg, @@ -18,6 +17,7 @@ use wormchain_accounting::{ }, state, }; +use serde::Serialize; use wormhole::{ token::{Action, GovernancePacket}, vaa::{Body, Header, Signature}, @@ -253,10 +253,10 @@ pub fn proper_instantiate() -> (fake::WormholeKeeper, Contract) { let wh = fake::WormholeKeeper::new(); let mut app = fake_app(wh.clone()); - let accounting_id = app.store_code(Box::new(ContractWrapper::new( - wormchain_accounting::contract::execute, - wormchain_accounting::contract::instantiate, - wormchain_accounting::contract::query, + let accountant_id = app.store_code(Box::new(ContractWrapper::new( + global_accountant::contract::execute, + global_accountant::contract::instantiate, + global_accountant::contract::query, ))); // We want the contract to be able to upgrade itself, which means we have to set the contract @@ -278,11 +278,11 @@ pub fn proper_instantiate() -> (fake::WormholeKeeper, Contract) { // can't use it here. Maybe something to bring up with upstream. let addr = app .instantiate_contract( - accounting_id, + accountant_id, Addr::unchecked(ADMIN), &Empty {}, &[], - "accounting", + "accountant", Some("contract0".into()), ) .unwrap(); diff --git a/cosmwasm/contracts/wormchain-accounting/tests/missing_observations.rs b/cosmwasm/contracts/global-accountant/tests/missing_observations.rs similarity index 99% rename from cosmwasm/contracts/wormchain-accounting/tests/missing_observations.rs rename to cosmwasm/contracts/global-accountant/tests/missing_observations.rs index 3ffda8bc7..8cc860775 100644 --- a/cosmwasm/contracts/wormchain-accounting/tests/missing_observations.rs +++ b/cosmwasm/contracts/global-accountant/tests/missing_observations.rs @@ -1,9 +1,9 @@ mod helpers; -use accounting::state::transfer; +use accountant::state::transfer; use cosmwasm_std::{to_binary, Uint256}; +use global_accountant::msg::Observation; use helpers::*; -use wormchain_accounting::msg::Observation; use wormhole::{token::Message, Address, Amount, Chain}; fn create_observation() -> Observation { diff --git a/cosmwasm/contracts/wormchain-accounting/tests/modify_balance.rs b/cosmwasm/contracts/global-accountant/tests/modify_balance.rs similarity index 99% rename from cosmwasm/contracts/wormchain-accounting/tests/modify_balance.rs rename to cosmwasm/contracts/global-accountant/tests/modify_balance.rs index e056cc3d5..516744eb5 100644 --- a/cosmwasm/contracts/wormchain-accounting/tests/modify_balance.rs +++ b/cosmwasm/contracts/global-accountant/tests/modify_balance.rs @@ -1,6 +1,6 @@ mod helpers; -use accounting::state::{account, Kind, Modification}; +use accountant::state::{account, Kind, Modification}; use cosmwasm_std::{to_binary, Event, Uint256}; use helpers::*; diff --git a/cosmwasm/contracts/wormchain-accounting/tests/query.rs b/cosmwasm/contracts/global-accountant/tests/query.rs similarity index 99% rename from cosmwasm/contracts/wormchain-accounting/tests/query.rs rename to cosmwasm/contracts/global-accountant/tests/query.rs index d0a8e381e..c641c25c4 100644 --- a/cosmwasm/contracts/wormchain-accounting/tests/query.rs +++ b/cosmwasm/contracts/global-accountant/tests/query.rs @@ -2,13 +2,13 @@ mod helpers; use std::collections::BTreeMap; -use accounting::state::{ +use accountant::state::{ account::{self, Balance}, transfer, Kind, Modification, Transfer, }; use cosmwasm_std::{to_binary, Uint256}; +use global_accountant::msg::TransferStatus; use helpers::*; -use wormchain_accounting::msg::TransferStatus; use wormhole::{token::Message, vaa::Body, Address, Amount}; use wormhole_bindings::fake; diff --git a/cosmwasm/contracts/wormchain-accounting/tests/submit_observations.rs b/cosmwasm/contracts/global-accountant/tests/submit_observations.rs similarity index 99% rename from cosmwasm/contracts/wormchain-accounting/tests/submit_observations.rs rename to cosmwasm/contracts/global-accountant/tests/submit_observations.rs index 21bf240ef..7004cb62a 100644 --- a/cosmwasm/contracts/wormchain-accounting/tests/submit_observations.rs +++ b/cosmwasm/contracts/global-accountant/tests/submit_observations.rs @@ -2,11 +2,11 @@ mod helpers; use std::collections::BTreeMap; -use accounting::state::{account, transfer, Kind, Modification, TokenAddress}; +use accountant::state::{account, transfer, Kind, Modification, TokenAddress}; use cosmwasm_std::{from_binary, to_binary, Binary, Event, Uint256}; use cw_multi_test::AppResponse; +use global_accountant::msg::{Observation, ObservationStatus, SubmitObservationResponse}; use helpers::*; -use wormchain_accounting::msg::{Observation, ObservationStatus, SubmitObservationResponse}; use wormhole::{ token::Message, vaa::{Body, Header}, diff --git a/cosmwasm/contracts/wormchain-accounting/tests/submit_vaas.rs b/cosmwasm/contracts/global-accountant/tests/submit_vaas.rs similarity index 98% rename from cosmwasm/contracts/wormchain-accounting/tests/submit_vaas.rs rename to cosmwasm/contracts/global-accountant/tests/submit_vaas.rs index 5af18a9be..2898263c7 100644 --- a/cosmwasm/contracts/wormchain-accounting/tests/submit_vaas.rs +++ b/cosmwasm/contracts/global-accountant/tests/submit_vaas.rs @@ -1,10 +1,10 @@ mod helpers; -use accounting::state::{transfer, TokenAddress}; +use accountant::state::{transfer, TokenAddress}; use cosmwasm_std::{from_binary, to_binary, Binary, Event, Uint256}; +use global_accountant::msg::{Observation, ObservationStatus, SubmitObservationResponse}; use helpers::*; use serde_wormhole::RawMessage; -use wormchain_accounting::msg::{Observation, ObservationStatus, SubmitObservationResponse}; use wormhole::{ token::Message, vaa::{Body, Header, Vaa}, diff --git a/cosmwasm/contracts/wormchain-accounting/tests/upgrade_contract.rs b/cosmwasm/contracts/global-accountant/tests/upgrade_contract.rs similarity index 97% rename from cosmwasm/contracts/wormchain-accounting/tests/upgrade_contract.rs rename to cosmwasm/contracts/global-accountant/tests/upgrade_contract.rs index 7cfbe3944..b4d8e820a 100644 --- a/cosmwasm/contracts/wormchain-accounting/tests/upgrade_contract.rs +++ b/cosmwasm/contracts/global-accountant/tests/upgrade_contract.rs @@ -5,8 +5,8 @@ use cosmwasm_std::{ to_binary, Binary, Deps, DepsMut, Empty, Env, Event, MessageInfo, Response, StdResult, }; use cw_multi_test::ContractWrapper; +use global_accountant::msg::Upgrade; use helpers::*; -use wormchain_accounting::msg::Upgrade; use wormhole_bindings::WormholeQuery; pub fn instantiate( diff --git a/cosmwasm/deployment/terra2/tools/deploy.js b/cosmwasm/deployment/terra2/tools/deploy.js index 5a57d7839..aefa6579f 100644 --- a/cosmwasm/deployment/terra2/tools/deploy.js +++ b/cosmwasm/deployment/terra2/tools/deploy.js @@ -22,7 +22,7 @@ const artifacts = [ "mock_bridge_integration_2.wasm", "shutdown_core_bridge_cosmwasm.wasm", "shutdown_token_bridge_cosmwasm.wasm", - "wormchain_accounting.wasm", + "global_accountant.wasm", ]; /* Check that the artifact folder contains all the wasm files we expect and nothing else */ diff --git a/cosmwasm/packages/accounting/Cargo.toml b/cosmwasm/packages/accountant/Cargo.toml similarity index 97% rename from cosmwasm/packages/accounting/Cargo.toml rename to cosmwasm/packages/accountant/Cargo.toml index e75192777..23e1461b8 100644 --- a/cosmwasm/packages/accounting/Cargo.toml +++ b/cosmwasm/packages/accountant/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "accounting" +name = "accountant" version = "0.1.0" authors = ["Wormhole Project Contributors"] edition = "2021" diff --git a/cosmwasm/packages/accounting/src/contract.rs b/cosmwasm/packages/accountant/src/contract.rs similarity index 99% rename from cosmwasm/packages/accounting/src/contract.rs rename to cosmwasm/packages/accountant/src/contract.rs index 30a827847..79256aac3 100644 --- a/cosmwasm/packages/accounting/src/contract.rs +++ b/cosmwasm/packages/accountant/src/contract.rs @@ -13,7 +13,7 @@ use crate::{ }, }; -/// Instantiate the on-chain state for accounting. Unlike other methods in this crate, +/// Instantiate the on-chain state for accountant. Unlike other methods in this crate, /// `instantiate` does not perform any validation of the data in `init`. pub fn instantiate(deps: DepsMut, init: Instantiate) -> anyhow::Result { let num_accounts = init.accounts.len(); @@ -72,7 +72,7 @@ pub fn validate_transfer(deps: Deps, t: &Transfer) -> anyhow: /// /// ``` /// # fn example() -> anyhow::Result<()> { -/// # use accounting::{ +/// # use accountant::{ /// # commit_transfer, /// # state::{transfer, Transfer}, /// # TransferError, @@ -201,7 +201,7 @@ pub enum ModifyBalanceError { /// /// ``` /// # fn example() { -/// # use accounting::{ +/// # use accountant::{ /// # modify_balance, /// # state::{Kind, Modification}, /// # ModifyBalanceError, @@ -405,7 +405,7 @@ mod tests { } #[test] - fn instantiate_accounting() { + fn instantiate_accountant() { let mut deps = mock_dependencies(); let count = 3; let msg = Instantiate { diff --git a/cosmwasm/packages/accounting/src/lib.rs b/cosmwasm/packages/accountant/src/lib.rs similarity index 100% rename from cosmwasm/packages/accounting/src/lib.rs rename to cosmwasm/packages/accountant/src/lib.rs diff --git a/cosmwasm/packages/accounting/src/msg.rs b/cosmwasm/packages/accountant/src/msg.rs similarity index 100% rename from cosmwasm/packages/accounting/src/msg.rs rename to cosmwasm/packages/accountant/src/msg.rs diff --git a/cosmwasm/packages/accounting/src/state.rs b/cosmwasm/packages/accountant/src/state.rs similarity index 94% rename from cosmwasm/packages/accounting/src/state.rs rename to cosmwasm/packages/accountant/src/state.rs index 0b7d6d7df..b1acd4443 100644 --- a/cosmwasm/packages/accounting/src/state.rs +++ b/cosmwasm/packages/accountant/src/state.rs @@ -12,9 +12,9 @@ pub use account::Account; pub use addr::TokenAddress; pub use transfer::Transfer; -pub const ACCOUNTS: Map = Map::new("accounting/accounts"); +pub const ACCOUNTS: Map = Map::new("accountant/accounts"); -pub const TRANSFERS: Map = Map::new("accounting/transfers"); +pub const TRANSFERS: Map = Map::new("accountant/transfers"); #[cw_serde] #[derive(Eq, PartialOrd, Ord)] @@ -52,4 +52,4 @@ pub struct Modification { pub reason: String, } -pub const MODIFICATIONS: Map = Map::new("accounting/modifications"); +pub const MODIFICATIONS: Map = Map::new("accountant/modifications"); diff --git a/cosmwasm/packages/accounting/src/state/account.rs b/cosmwasm/packages/accountant/src/state/account.rs similarity index 100% rename from cosmwasm/packages/accounting/src/state/account.rs rename to cosmwasm/packages/accountant/src/state/account.rs diff --git a/cosmwasm/packages/accounting/src/state/addr.rs b/cosmwasm/packages/accountant/src/state/addr.rs similarity index 100% rename from cosmwasm/packages/accounting/src/state/addr.rs rename to cosmwasm/packages/accountant/src/state/addr.rs diff --git a/cosmwasm/packages/accounting/src/state/transfer.rs b/cosmwasm/packages/accountant/src/state/transfer.rs similarity index 100% rename from cosmwasm/packages/accounting/src/state/transfer.rs rename to cosmwasm/packages/accountant/src/state/transfer.rs