Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Examples] Remove references to sui_programmability in codebase #18595

Merged
merged 10 commits into from
Jul 12, 2024
Merged

[Examples] Remove references to sui_programmability in codebase #18595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5564aa9
[Examples/Docs] Tic-tac-toe README
amnn Jul 7, 2024
f16f503
[Examples/Docs] Tic-tac-toe docs
amnn Jul 8, 2024
0801f17
fixup: Address comments (mainly on README)
amnn Jul 9, 2024
bc2e511
Using plugin
ronny-mysten Jul 10, 2024
ae802ab
fixup: tab size of 2
amnn Jul 10, 2024
75bdf69
fixup: remove duplicate code blocks -- use @inject where possible.
amnn Jul 10, 2024
20de138
fixup: change location of source links
amnn Jul 12, 2024
7dbfdaa
[Examples] Remove references to `sui_programmability` in codebase
amnn Jul 10, 2024
1626e60
fixup: cargo fmt
amnn Jul 10, 2024
6dff639
fixup: merge conflict -- basics::random
amnn Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/sui-core/src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ pub fn create_fake_cert_and_effect_digest<'a>(
}

pub fn compile_basics_package() -> CompiledPackage {
compile_example_package("../../sui_programmability/examples/basics")
compile_example_package("../../examples/move/basics")
}

pub fn compile_managed_coin_package() -> CompiledPackage {
Expand Down
13 changes: 6 additions & 7 deletions crates/sui-e2e-tests/tests/full_node_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use sui_sdk::wallet_context::WalletContext;
use sui_storage::key_value_store::TransactionKeyValueStore;
use sui_storage::key_value_store_metrics::KeyValueStoreMetrics;
use sui_test_transaction_builder::{
batch_make_transfer_transactions, create_devnet_nft, delete_devnet_nft, increment_counter,
batch_make_transfer_transactions, create_nft, delete_nft, increment_counter,
publish_basics_package, publish_basics_package_and_make_counter, publish_nfts_package,
TestTransactionBuilder,
};
Expand Down Expand Up @@ -672,7 +672,7 @@ async fn test_full_node_event_read_api_ok() {
// This is a poor substitute for the post processing taking some time
sleep(Duration::from_millis(1000)).await;

let (_sender, _object_id, digest2) = create_devnet_nft(context, package_id).await;
let (_sender, _object_id, digest2) = create_nft(context, package_id).await;

// Add a delay to ensure event processing is done after transaction commits.
sleep(Duration::from_secs(5)).await;
Expand Down Expand Up @@ -702,15 +702,15 @@ async fn test_full_node_event_query_by_module_ok() {
// This is a poor substitute for the post processing taking some time
sleep(Duration::from_millis(1000)).await;

let (_sender, _object_id, digest2) = create_devnet_nft(context, package_id).await;
let (_sender, _object_id, digest2) = create_nft(context, package_id).await;

// Add a delay to ensure event processing is done after transaction commits.
sleep(Duration::from_secs(5)).await;

// query by move event module
let params = rpc_params![EventFilter::MoveEventModule {
package: package_id,
module: ident_str!("devnet_nft").into()
module: ident_str!("testnet_nft").into()
}];
let page: EventPage = jsonrpc_client
.request("suix_queryEvents", params)
Expand Down Expand Up @@ -980,7 +980,7 @@ async fn test_get_objects_read() -> Result<(), anyhow::Error> {
let package_id = publish_nfts_package(&test_cluster.wallet).await.0;

// Create the object
let (sender, object_id, _) = create_devnet_nft(&test_cluster.wallet, package_id).await;
let (sender, object_id, _) = create_nft(&test_cluster.wallet, package_id).await;

let recipient = test_cluster.get_address_1();
assert_ne!(sender, recipient);
Expand Down Expand Up @@ -1011,8 +1011,7 @@ async fn test_get_objects_read() -> Result<(), anyhow::Error> {
.expect("Failed to transfer coins to recipient");

// Delete the object
let response =
delete_devnet_nft(&test_cluster.wallet, recipient, package_id, object_ref_v2).await;
let response = delete_nft(&test_cluster.wallet, recipient, package_id, object_ref_v2).await;
assert_eq!(
*response.effects.unwrap().status(),
SuiExecutionStatus::Success
Expand Down
9 changes: 3 additions & 6 deletions crates/sui-framework-tests/src/metered_verifier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,12 @@ fn test_metered_move_bytecode_verifier() {
// Check shared meter logic works across all publish in PT
let mut packages = vec![];
let with_unpublished_deps = false;
let path =
PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../sui_programmability/examples/basics");
let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../examples/move/basics");
let package = build(&path).unwrap();
packages.push(package.get_dependency_sorted_modules(with_unpublished_deps));
packages.push(package.get_dependency_sorted_modules(with_unpublished_deps));

let path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.join("../../sui_programmability/examples/fungible_tokens");
let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../examples/move/coin");
let package = build(&path).unwrap();
packages.push(package.get_dependency_sorted_modules(with_unpublished_deps));

Expand Down Expand Up @@ -288,8 +286,7 @@ fn test_build_and_verify_programmability_examples() {
let meter_config = protocol_config.meter_config();
let registry = &Registry::new();
let bytecode_verifier_metrics = Arc::new(BytecodeVerifierMetrics::new(registry));
let examples =
PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../sui_programmability/examples");
let examples = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../examples");

for example in std::fs::read_dir(examples).unwrap() {
let Ok(example) = example else { continue };
Expand Down
26 changes: 0 additions & 26 deletions crates/sui-framework-tests/src/unit_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,32 +52,6 @@ fn run_bridge_tests() {
check_move_unit_tests(&buf);
}

#[test]
#[cfg_attr(msim, ignore)]
fn run_sui_programmability_examples_move_unit_tests() {
let examples_dir = Path::new(env!("CARGO_MANIFEST_DIR"))
.join("..")
.join("..")
.join("sui_programmability")
.join("examples");

for example in [
"basics",
"capy",
"crypto",
"defi",
"fungible_tokens",
"games",
"move_tutorial",
"nfts",
"objects_tutorial",
] {
let path = examples_dir.join(example);
check_package_builds(&path);
check_move_unit_tests(&path);
}
}

fn check_packages_recursively(path: &Path) -> io::Result<()> {
for entry in fs::read_dir(path).unwrap() {
let entry = entry?;
Expand Down
5 changes: 2 additions & 3 deletions crates/sui-json-rpc-tests/tests/rpc_server_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,8 @@ async fn test_publish() -> Result<(), anyhow::Error> {
.await?;
let gas = objects.data.first().unwrap().object().unwrap();

let compiled_package = BuildConfig::new_for_testing().build(Path::new(
"../../sui_programmability/examples/fungible_tokens",
))?;
let compiled_package =
BuildConfig::new_for_testing().build(Path::new("../../examples/move/basics"))?;
let compiled_modules_bytes =
compiled_package.get_package_base64(/* with_unpublished_deps */ false);
let dependencies = compiled_package.get_dependency_original_package_ids();
Expand Down
Loading
Loading