Skip to content

Commit fe60b2c

Browse files
committed
sui: fix warnings on new toolchain
1 parent 5afcc1d commit fe60b2c

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

sui/packages/ntt/tests/ntt_scenario.move

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#[test_only]
2+
#[allow(deprecated_usage)]
23
/// This module implements ways to initialize NTT in a test scenario.
34
/// It provides common setup functions and test utilities.
45
module ntt::ntt_scenario {

sui/packages/ntt/tests/ntt_tests.move

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ module ntt::ntt_tests {
244244
ntt_scenario::return_state(state);
245245
ntt_scenario::return_clock(clock);
246246
ntt_scenario::return_coin_metadata(coin_meta);
247-
sui::test_utils::destroy(dust);
247+
std::unit_test::destroy(dust);
248248
test_scenario::end(scenario);
249249
}
250250

@@ -291,20 +291,20 @@ module ntt::ntt_tests {
291291
&clock
292292
);
293293

294-
sui::test_utils::destroy(transceiver_a_message);
294+
std::unit_test::destroy(transceiver_a_message);
295295

296296
// this will fail, because transceiver a already released the message
297297
let transceiver_a_message = state.create_transceiver_message<test_transceiver_a::TransceiverAuth, _>(
298298
message_id,
299299
&clock
300300
);
301-
sui::test_utils::destroy(transceiver_a_message);
301+
std::unit_test::destroy(transceiver_a_message);
302302

303303
// Clean up
304304
ntt_scenario::return_state(state);
305305
ntt_scenario::return_clock(clock);
306306
ntt_scenario::return_coin_metadata(coin_meta);
307-
sui::test_utils::destroy(dust);
307+
std::unit_test::destroy(dust);
308308
test_scenario::end(scenario);
309309
}
310310

@@ -391,7 +391,7 @@ module ntt::ntt_tests {
391391
ntt_scenario::return_state(state);
392392
ntt_scenario::return_clock(clock);
393393
ntt_scenario::return_coin_metadata(coin_meta);
394-
sui::test_utils::destroy(coins);
394+
std::unit_test::destroy(coins);
395395
scenario.end();
396396
}
397397

@@ -691,7 +691,7 @@ module ntt::ntt_tests {
691691
ntt_scenario::return_state(state);
692692
ntt_scenario::return_clock(clock);
693693
ntt_scenario::return_coin_metadata(coin_meta);
694-
sui::test_utils::destroy(dust);
694+
std::unit_test::destroy(dust);
695695
scenario.end();
696696
}
697697

@@ -817,7 +817,7 @@ module ntt::ntt_tests {
817817
ntt_scenario::return_state(state);
818818
ntt_scenario::return_clock(clock);
819819
ntt_scenario::return_coin_metadata(coin_meta);
820-
sui::test_utils::destroy(dust);
820+
std::unit_test::destroy(dust);
821821
scenario.end();
822822
}
823823

sui/packages/ntt_common/sources/contract_auth.move

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ module ntt_common::contract_auth {
5050
b"Invalid auth type";
5151

5252
public fun get_auth_address<Auth>(type_name: vector<u8>): Option<address> {
53-
let fqt = type_name::get<Auth>();
53+
let fqt = type_name::with_defining_ids<Auth>();
5454

55-
let address_hex = fqt.get_address().into_bytes();
55+
let address_hex = fqt.address_string().into_bytes();
5656
let addy = address::from_bytes(hex::decode(address_hex));
5757

58-
let mod = fqt.get_module().into_bytes();
58+
let mod = fqt.module_string().into_bytes();
5959

6060
let mut expected = address_hex;
6161
expected.append(b"::");
@@ -84,8 +84,8 @@ module ntt_common::contract_auth {
8484

8585
public fun auth_as<Auth, State: key>(_auth: &Auth, type_name: vector<u8>, obj: &State): address {
8686
let package_id = assert_auth_type<Auth>(_auth, type_name);
87-
let fqt = type_name::get<State>();
88-
let state_package_id = address::from_bytes(hex::decode(fqt.get_address().into_bytes()));
87+
let fqt = type_name::with_defining_ids<State>();
88+
let state_package_id = address::from_bytes(hex::decode(fqt.address_string().into_bytes()));
8989
assert!(package_id == state_package_id, EInvalidAuthType);
9090

9191
object::id_address(obj)

sui/packages/ntt_common/sources/datatypes/bitmap.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module ntt_common::bitmap {
3737
count = count + 1;
3838
};
3939
mask = mask << 1;
40-
i = i + 1;
40+
i = i + 1u64;
4141
};
4242
count
4343
}

sui/packages/ntt_common/sources/messages/ntt_manager_message.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module ntt_common::ntt_manager_message {
5858
message: NttManagerMessage<vector<u8>>
5959
): vector<u8> {
6060
let NttManagerMessage {id, sender, payload} = message;
61-
assert!(vector::length(&payload) < (((1<<16)-1) as u64), E_PAYLOAD_TOO_LONG);
61+
assert!(vector::length(&payload) < (((1u64<<16)-1) as u64), E_PAYLOAD_TOO_LONG);
6262
let payload_length = (vector::length(&payload) as u16);
6363

6464
let mut buf: vector<u8> = vector::empty<u8>();

0 commit comments

Comments
 (0)