Skip to content

Commit

Permalink
refactor(SUI): move syntax update (#49)
Browse files Browse the repository at this point in the history 
* refactor(SUI): move syntax update

* fix(ITS): removed unused use
  • Loading branch information
@re1ro
re1ro authored Jun 4, 2024
1 parent 04d7c87 commit 920616a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 21 deletions.
19 changes: 9 additions & 10 deletions move/its/sources/discovery.move
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module its::discovery {
use std::type_name;

use sui::address;
use sui::bcs;

use abi::abi::{Self, AbiReader};

Expand Down Expand Up @@ -42,7 +41,7 @@ module its::discovery {
public fun register_transaction(self: &mut ITS, discovery: &mut RelayerDiscovery) {
self.set_relayer_discovery_id(discovery);
let mut arg = vector[0];
arg.append(bcs::to_bytes(&object::id(self)));
arg.append(object::id(self).to_bytes());

let arguments = vector[
arg,
Expand Down Expand Up @@ -88,7 +87,7 @@ module its::discovery {

if (data.is_empty()) {
let mut arg = vector[0];
arg.append(address::to_bytes(object::id_address(self)));
arg.append(object::id_address(self).to_bytes());

let type_name = self.get_registered_coin_type(token_id);

Expand Down Expand Up @@ -137,7 +136,7 @@ module its::discovery {

fun get_deploy_interchain_token_tx(self: &ITS, reader: &mut AbiReader): Transaction {
let mut arg = vector[0];
arg.append(address::to_bytes(object::id_address(self)));
arg.append(object::id_address(self).to_bytes());

let arguments = vector[
arg,
Expand Down Expand Up @@ -171,7 +170,7 @@ module its::discovery {
#[test_only]
fun get_initial_tx(self: &ITS): Transaction {
let mut arg = vector[0];
arg.append(bcs::to_bytes(&object::id(self)));
arg.append(sui::bcs::to_bytes(&object::id(self)));

let arguments = vector[
arg,
Expand Down Expand Up @@ -229,7 +228,7 @@ module its::discovery {
.write_u256(MESSAGE_TYPE_INTERCHAIN_TRANSFER)
.write_u256(address::to_u256(token_id))
.write_bytes(source_address)
.write_bytes(address::to_bytes(target_channel))
.write_bytes(target_channel.to_bytes())
.write_u256(amount)
.write_bytes(data);
let payload = writer.into_bytes();
Expand All @@ -250,7 +249,7 @@ module its::discovery {
assert!(call_info.function().module_name() == ascii::string(b"service"), 4);
assert!(call_info.function().name() == ascii::string(b"receive_interchain_transfer"), 5);
let mut arg = vector[0];
arg.append(address::to_bytes(object::id_address(&its)));
arg.append(object::id_address(&its).to_bytes());

let arguments = vector[
arg,
Expand All @@ -277,7 +276,7 @@ module its::discovery {
let source_address = b"source address";
let target_channel = @0x5678;
let amount = 1905;
let tx_data = bcs::to_bytes(&get_initial_tx(&its));
let tx_data = sui::bcs::to_bytes(&get_initial_tx(&its));
let mut writer = abi::new_writer(2);
writer
.write_bytes(tx_data)
Expand All @@ -289,7 +288,7 @@ module its::discovery {
.write_u256(MESSAGE_TYPE_INTERCHAIN_TRANSFER)
.write_u256(address::to_u256(token_id))
.write_bytes(source_address)
.write_bytes(address::to_bytes(target_channel))
.write_bytes(target_channel.to_bytes())
.write_u256(amount)
.write_bytes(data);
let payload = writer.into_bytes();
Expand Down Expand Up @@ -345,7 +344,7 @@ module its::discovery {
assert!(call_info.function().module_name() == ascii::string(b"service"), 5);
assert!(call_info.function().name() == ascii::string(b"receive_deploy_interchain_token"), 6);
let mut arg = vector[0];
arg.append(address::to_bytes(object::id_address(&its)));
arg.append(object::id_address(&its).to_bytes());

let arguments = vector[
arg,
Expand Down
7 changes: 2 additions & 5 deletions move/its/sources/its.move
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,8 @@ module its::its {
}

public(package) fun coin_management_mut<T>(self: &mut ITS, token_id: TokenId): &mut CoinManagement<T> {
&mut coin_data_mut<T>(self, token_id).coin_management
}

public(package) fun coin_data_mut<T>(self: &mut ITS, token_id: TokenId): &mut CoinData<T> {
&mut self.registered_coins[token_id]
let coin_data: &mut CoinData<T> = &mut self.registered_coins[token_id];
&mut coin_data.coin_management
}

public(package) fun add_unregistered_coin<T>(
Expand Down
6 changes: 3 additions & 3 deletions move/its/sources/service.move
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module its::service {

use governance::governance::{Self, Governance};

use its::its::{Self, ITS};
use its::its::{ITS};
use its::coin_info::{Self, CoinInfo};
use its::token_id::{Self, TokenId};
use its::coin_management::{Self, CoinManagement};
Expand Down Expand Up @@ -93,7 +93,7 @@ module its::service {
writer
.write_u256(MESSAGE_TYPE_INTERCHAIN_TRANSFER)
.write_u256(token_id.to_u256())
.write_bytes(address::to_bytes(ctx.sender()))
.write_bytes(ctx.sender().to_bytes())
.write_bytes(destination_address)
.write_u256(amount)
.write_bytes(data);
Expand Down Expand Up @@ -235,7 +235,7 @@ module its::service {
// === Special Call Receiving
public fun set_trusted_addresses(its: &mut ITS, governance: &Governance, approved_message: ApprovedMessage) {
let (source_chain, _, source_address, payload) = channel::consume_approved_message(
its::channel_mut(its), approved_message
its.channel_mut(), approved_message
);

assert!(governance::is_governance(governance, source_chain, source_address), EUntrustedAddress);
Expand Down
4 changes: 2 additions & 2 deletions move/its/sources/token_id.move
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module its::token_id {
has_metadata: &bool,
has_treasury: &bool
): TokenId {
let mut vec = address::to_bytes(address::from_u256(PREFIX_SUI_TOKEN_ID));
let mut vec = address::from_u256(PREFIX_SUI_TOKEN_ID).to_bytes();
vec.append(bcs::to_bytes(&type_name::get<T>()));
vec.append(bcs::to_bytes(name));
vec.append(bcs::to_bytes(symbol));
Expand Down Expand Up @@ -88,7 +88,7 @@ module its::token_id {
let symbol = ascii::string(b"Symbol");
let decimals: u8 = 56;
let coin_info = coin_info::from_info<String>(name, symbol, decimals);
let mut vec = address::to_bytes(address::from_u256(PREFIX_SUI_TOKEN_ID));
let mut vec = address::from_u256(PREFIX_SUI_TOKEN_ID).to_bytes();

vec.append<u8>(bcs::to_bytes<CoinInfo<String>>(&coin_info));
coin_info.drop();
Expand Down
2 changes: 1 addition & 1 deletion move/test/sources/test/test.move
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module test::test {
let mut arg = vector::singleton<u8>(2);
arguments.push_back(arg);
arg = vector::singleton<u8>(0);
arg.append(address::to_bytes(object::id_address(singleton)));
arg.append(object::id_address(singleton).to_bytes());
arguments.push_back(arg);
let transaction = discovery::new_transaction(
true,
Expand Down

0 comments on commit 920616a

Please sign in to comment.