From 81100945acf5ab9de0be10880a6d32e7c4b8e276 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 24 Jan 2023 11:25:02 +0000 Subject: [PATCH 1/4] instantiate: display contract account *after* events --- crates/cargo-contract/src/cmd/extrinsics/instantiate.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs b/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs index a04188aea..5cc1482af 100644 --- a/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs +++ b/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs @@ -336,11 +336,11 @@ impl Exec { }; println!("{}", display_instantiate_result.to_json()?) } else { + println!("{}", events.display_events(self.verbosity, token_metadata)?); if let Some(code_hash) = code_hash { name_value_println!("Code hash", format!("{:?}", code_hash)); } name_value_println!("Contract", contract_address); - println!("{}", events.display_events(self.verbosity, token_metadata)?) }; Ok(()) } From 5ba4b98105ac9ac8a8e1bb8b0fddd8256b76308d Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 24 Jan 2023 11:36:54 +0000 Subject: [PATCH 2/4] Match Events header colour --- crates/cargo-contract/src/cmd/extrinsics/events.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cargo-contract/src/cmd/extrinsics/events.rs b/crates/cargo-contract/src/cmd/extrinsics/events.rs index fbd354a9f..b35ea7d57 100644 --- a/crates/cargo-contract/src/cmd/extrinsics/events.rs +++ b/crates/cargo-contract/src/cmd/extrinsics/events.rs @@ -160,7 +160,7 @@ impl DisplayEvents { let event_field_indent: usize = DEFAULT_KEY_COL_WIDTH - 3; let mut out = format!( "{:>width$}\n", - "Events".bold(), + "Events".bright_purple().bold(), width = DEFAULT_KEY_COL_WIDTH ); for event in &self.0 { From 142e6fe19adea416b193decbe86993274f38c6bf Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 24 Jan 2023 11:45:39 +0000 Subject: [PATCH 3/4] Upload duplicate code hash hex display --- crates/cargo-contract/src/cmd/extrinsics/upload.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/cargo-contract/src/cmd/extrinsics/upload.rs b/crates/cargo-contract/src/cmd/extrinsics/upload.rs index 79f410c34..7765ce70e 100644 --- a/crates/cargo-contract/src/cmd/extrinsics/upload.rs +++ b/crates/cargo-contract/src/cmd/extrinsics/upload.rs @@ -116,8 +116,9 @@ impl UploadCommand { } Ok(()) } else { + let code_hash = hex::encode(&code_hash); Err(anyhow::anyhow!( - "This contract has already been uploaded with code hash: {code_hash:?}" + "This contract has already been uploaded with code hash: 0x{code_hash}" ) .into()) } From 255629e7728d63da35c94b4be5a6f71255475e05 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 24 Jan 2023 12:10:33 +0000 Subject: [PATCH 4/4] Clippy --- crates/cargo-contract/src/cmd/extrinsics/upload.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cargo-contract/src/cmd/extrinsics/upload.rs b/crates/cargo-contract/src/cmd/extrinsics/upload.rs index 7765ce70e..f74519d87 100644 --- a/crates/cargo-contract/src/cmd/extrinsics/upload.rs +++ b/crates/cargo-contract/src/cmd/extrinsics/upload.rs @@ -116,7 +116,7 @@ impl UploadCommand { } Ok(()) } else { - let code_hash = hex::encode(&code_hash); + let code_hash = hex::encode(code_hash); Err(anyhow::anyhow!( "This contract has already been uploaded with code hash: 0x{code_hash}" )