Skip to content

Commit

Permalink
address some comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Foivos committed Jul 29, 2024
1 parent 34609ab commit 48b4b10
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
2 changes: 1 addition & 1 deletion move/axelar_gateway/sources/auth.move
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ module axelar_gateway::auth {
}

#[test_only]
public fun dummy_for_testing(ctx: &mut TxContext): AxelarSigners {
public fun dummy(ctx: &mut TxContext): AxelarSigners {
AxelarSigners {
epoch: 0,
epoch_by_signers_hash: table::new(ctx),
Expand Down
24 changes: 10 additions & 14 deletions move/axelar_gateway/sources/gateway.move
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ module axelar_gateway::gateway {
}

#[test_only]
public fun new_for_testing(
public fun create_for_testing(
operator: address,
domain_separator: Bytes32,
minimum_rotation_delay: u64,
Expand All @@ -373,12 +373,12 @@ module axelar_gateway::gateway {
}

#[test_only]
public fun dummy_for_testing(ctx: &mut TxContext): Gateway {
public fun dummy(ctx: &mut TxContext): Gateway {
Gateway {
id: object::new(ctx),
operator: @0x0,
messages: table::new(ctx),
signers: auth::dummy_for_testing(ctx),
signers: auth::dummy(ctx),
}
}

Expand All @@ -404,7 +404,7 @@ module axelar_gateway::gateway {
let domain_separator = bytes32::new(@789012);
let minimum_rotation_delay = 765;
let previous_signers_retention = 650;
let initial_signers = axelar_gateway::weighted_signers::dummy_for_testing();
let initial_signers = axelar_gateway::weighted_signers::dummy();
let mut clock = sui::clock::create_for_testing(ctx);
let timestamp = 1234;
clock.increment_for_testing(timestamp);
Expand All @@ -427,14 +427,11 @@ module axelar_gateway::gateway {
);

let tx_effects = scenario.next_tx(@0x1);

let shared = tx_effects.shared();


assert!(shared.length() == 1, 0);

let gateway_id = shared[0];

let gateway = scenario.take_shared_by_id<Gateway>(gateway_id);

let Gateway {
Expand All @@ -446,7 +443,6 @@ module axelar_gateway::gateway {

id.delete();
assert!(operator == operator_result, 1);

messages.destroy_empty();

let (
Expand Down Expand Up @@ -491,7 +487,7 @@ module axelar_gateway::gateway {
payload_hash,
);

let mut gateway = dummy_for_testing(ctx);
let mut gateway = dummy(ctx);

approve_message(&mut gateway, &message);
// The second approve message should do nothing.
Expand Down Expand Up @@ -590,7 +586,7 @@ module axelar_gateway::gateway {

#[test]
fun test_peel_weighted_signers() {
let signers = axelar_gateway::weighted_signers::dummy_for_testing();
let signers = axelar_gateway::weighted_signers::dummy();

let bytes = bcs::to_bytes(&signers);

Expand All @@ -602,7 +598,7 @@ module axelar_gateway::gateway {
#[test]
#[expected_failure(abort_code = ERemainingData)]
fun test_peel_weighted_signers_no_remaining_data() {
let signers = axelar_gateway::weighted_signers::dummy_for_testing();
let signers = axelar_gateway::weighted_signers::dummy();

let mut bytes = bcs::to_bytes(&signers);
bytes.push_back(0);
Expand All @@ -613,7 +609,7 @@ module axelar_gateway::gateway {

#[test]
fun test_peel_proof() {
let proof = axelar_gateway::proof::dummy_for_testing();
let proof = axelar_gateway::proof::dummy();

let bytes = bcs::to_bytes(&proof);

Expand All @@ -625,7 +621,7 @@ module axelar_gateway::gateway {
#[test]
#[expected_failure(abort_code = ERemainingData)]
fun test_peel_proof_no_remaining_data() {
let proof = axelar_gateway::proof::dummy_for_testing();
let proof = axelar_gateway::proof::dummy();

let mut bytes = bcs::to_bytes(&proof);
bytes.push_back(0);
Expand All @@ -636,7 +632,7 @@ module axelar_gateway::gateway {
#[test]
#[expected_failure(abort_code = EMessageNotApproved)]
fun test_take_approved_message_message_not_approved() {
let mut gateway = dummy_for_testing(&mut sui::tx_context::dummy());
let mut gateway = dummy(&mut sui::tx_context::dummy());

let message = message::new(
std::ascii::string(b"Source Chain"),
Expand Down
6 changes: 3 additions & 3 deletions move/axelar_gateway/sources/types/proof.move
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,20 @@ module axelar_gateway::proof {
}

#[test_only]
public fun new_for_testing(signers: WeightedSigners, signatures: vector<Signature>): Proof {
public fun create_for_testing(signers: WeightedSigners, signatures: vector<Signature>): Proof {
Proof {
signers,
signatures,
}
}

#[test_only]
public fun dummy_for_testing(): Proof {
public fun dummy(): Proof {
let mut signature = sui::address::to_bytes(@0x01);
signature.append(sui::address::to_bytes(@0x23));
signature.push_back(2);
Proof {
signers: axelar_gateway::weighted_signers::dummy_for_testing(),
signers: axelar_gateway::weighted_signers::dummy(),
signatures: vector[ Signature { bytes: signature } ],
}
}
Expand Down
4 changes: 2 additions & 2 deletions move/axelar_gateway/sources/types/weighted_signers.move
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module axelar_gateway::weighted_signers {
}

#[test_only]
public fun new_for_testing(
public fun create_for_testing(
signers: vector<WeightedSigner>,
threshold: u128,
nonce: Bytes32,
Expand All @@ -75,7 +75,7 @@ module axelar_gateway::weighted_signers {
}

#[test_only]
public fun dummy_for_testing(): WeightedSigners {
public fun dummy(): WeightedSigners {
let pub_key = vector[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32];
let signer = axelar_gateway::weighted_signer::new(pub_key, 123);
let nonce = bytes32::new(@3456);
Expand Down

0 comments on commit 48b4b10

Please sign in to comment.