Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Foivos committed Jul 9, 2024
2 parents 473205a + 03c9d7b commit 24c1dd3
Show file tree
Hide file tree
Showing 21 changed files with 1,159 additions and 37 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,5 @@ target/
*.pdb

# dist
dist
dist
move_comile
2 changes: 1 addition & 1 deletion move/abi/Move.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[move]
version = 2
manifest_digest = "89B38FFD4D0D8B2DCFE440924446CCF3A347EA904B2657C9CA229BD7BB881131"
manifest_digest = "134C22A16B63D227C88D4E1F5D02607C8E7C2D0FA5D3BAD6136E0041F441654D"
deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
dependencies = [
{ name = "Sui" },
Expand Down
4 changes: 2 additions & 2 deletions move/abi/Move.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "Abi"
version = "0.1.0"
published-at = "0x845c6fa54ccb69bde81098dabac0e1fb11dd9ae217a034992203ce99801a3b67"
published-at = "0x41fb7e9c9d8851ecbfd4b89c910c0465de0cd0cf757c4bb261a8a6019ea33390"
edition = "2024.beta"

[dependencies]
Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.25.3" }

[addresses]
abi = "0x845c6fa54ccb69bde81098dabac0e1fb11dd9ae217a034992203ce99801a3b67"
abi = "0x0"
2 changes: 1 addition & 1 deletion move/axelar_gateway/Move.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[move]
version = 2
manifest_digest = "10303CE6C59BAA2CE814E3D11BACC8CB24BE0F8D66753B02190E291CA40F0D39"
manifest_digest = "1EB54C26C3FA638760DAA54E631C0B13A09FFC472C1CAA730C9A7879E463B455"
deps_digest = "F8BBB0CCB2491CA29A3DF03D6F92277A4F3574266507ACD77214D37ECA3F3082"
dependencies = [
{ name = "Sui" },
Expand Down
2 changes: 1 addition & 1 deletion move/axelar_gateway/Move.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2024.beta"
Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.25.3" }

[addresses]
axelar_gateway = "0xe44f3fb828db14a0dd991de2aed9c987ee49faf7c31bf819b986a058a38e9935"
axelar_gateway = "0xcd391ade5ab55a218f8988df8f3aa38ec019651c217244f7f689616c87d8c289"
clock = "0x6"
5 changes: 0 additions & 5 deletions move/axelar_gateway/info.json

This file was deleted.

17 changes: 17 additions & 0 deletions move/axelar_gateway/sources/channel.move
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,23 @@ module axelar_gateway::channel {
// Tests
// -----

#[test_only]
public fun new_approved_message(
source_chain: String,
message_id: String,
source_address: String,
destination_id: address,
payload: vector<u8>,
): ApprovedMessage {
ApprovedMessage {
source_chain,
message_id,
source_address,
destination_id,
payload
}
}

#[test]
fun test_new_and_destroy() {
let ctx = &mut sui::tx_context::dummy();
Expand Down
5 changes: 0 additions & 5 deletions move/gas_service/info.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,9 @@ module gas_service::gas_service {
fun test_pay_gas() {
let ctx = &mut sui::tx_context::dummy();
let (mut service, cap) = new(ctx);
let value = 10;
// 2 bytes of the digest for a pseudo-random 1..65,536
let digest = ctx.digest();
let value = (((digest[0] as u16) << 8) | (digest[1] as u16) as u64) + 1;
let c: Coin<SUI> = coin::mint_for_testing(value, ctx);

service.pay_gas(
Expand All @@ -209,7 +211,8 @@ module gas_service::gas_service {
fun test_add_gas() {
let ctx = &mut sui::tx_context::dummy();
let (mut service, cap) = new(ctx);
let value = 10;
let digest = ctx.digest();
let value = (((digest[0] as u16) << 8) | (digest[1] as u16) as u64) + 1; // 1..65,536
let c: Coin<SUI> = coin::mint_for_testing(value, ctx);

service.add_gas(
Expand All @@ -229,7 +232,8 @@ module gas_service::gas_service {
fun test_collect_gas() {
let ctx = &mut sui::tx_context::dummy();
let (mut service, cap) = new(ctx);
let value = 10;
let digest = ctx.digest();
let value = (((digest[0] as u16) << 8) | (digest[1] as u16) as u64) + 1; // 1..65,536
let c: Coin<SUI> = coin::mint_for_testing(value, ctx);

service.add_gas(
Expand All @@ -256,7 +260,8 @@ module gas_service::gas_service {
fun test_refund() {
let ctx = &mut sui::tx_context::dummy();
let (mut service, cap) = new(ctx);
let value = 10;
let digest = ctx.digest();
let value = (((digest[0] as u16) << 8) | (digest[1] as u16) as u64) + 1; // 1..65,536
let c: Coin<SUI> = coin::mint_for_testing(value, ctx);

service.add_gas(
Expand All @@ -279,4 +284,58 @@ module gas_service::gas_service {
cap.destroy_cap();
service.destroy();
}

#[test]
#[expected_failure(abort_code = sui::balance::ENotEnough)]
fun test_collect_gas_insufficient_balance() {
let ctx = &mut sui::tx_context::dummy();
let (mut service, cap) = new(ctx);
let digest = ctx.digest();
let value = (((digest[0] as u16) << 8) | (digest[1] as u16) as u64) + 1; // 1..65,536
let c: Coin<SUI> = coin::mint_for_testing(value, ctx);

service.add_gas(
c,
std::ascii::string(b"message id"),
@0x0,
vector[],
);

service.collect_gas(
&cap,
ctx.sender(),
value + 1,
ctx,
);

cap.destroy_cap();
service.destroy();
}

#[test]
#[expected_failure(abort_code = sui::balance::ENotEnough)]
fun test_refund_insufficient_balance() {
let ctx = &mut sui::tx_context::dummy();
let (mut service, cap) = new(ctx);
let value = 10;
let c: Coin<SUI> = coin::mint_for_testing(value, ctx);

service.add_gas(
c,
std::ascii::string(b"message id"),
@0x0,
vector[],
);

service.refund(
&cap,
std::ascii::string(b"message id"),
ctx.sender(),
value + 1,
ctx,
);

cap.destroy_cap();
service.destroy();
}
}
4 changes: 0 additions & 4 deletions move/governance/info.json

This file was deleted.

Loading

0 comments on commit 24c1dd3

Please sign in to comment.