From 094647558c4531139252e7cc2064395274714b22 Mon Sep 17 00:00:00 2001 From: Omar Date: Fri, 6 Jan 2023 23:53:39 +0300 Subject: [PATCH] `address` field in `EncodeAddressResponse` is now public --- radix-engine-toolkit-core/src/memory.rs | 5 +- .../src/model/identifier.rs | 2 +- .../src/requests/encode_address_request.rs | 2 +- .../tests/test_vector/manifest/mod.rs | 68 +++++++++---------- 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/radix-engine-toolkit-core/src/memory.rs b/radix-engine-toolkit-core/src/memory.rs index ec7c54f4..a60bf8d8 100644 --- a/radix-engine-toolkit-core/src/memory.rs +++ b/radix-engine-toolkit-core/src/memory.rs @@ -160,6 +160,9 @@ where let byte_count = object_bytes.len() + 1; let pointer = toolkit_alloc(byte_count); - pointer.copy_from([object_bytes, &[0]].concat().as_ptr() as Pointer, byte_count); + pointer.copy_from( + [object_bytes, &[0]].concat().as_ptr() as Pointer, + byte_count, + ); Ok(pointer) } diff --git a/radix-engine-toolkit-core/src/model/identifier.rs b/radix-engine-toolkit-core/src/model/identifier.rs index fc7135a9..76d65b9c 100644 --- a/radix-engine-toolkit-core/src/model/identifier.rs +++ b/radix-engine-toolkit-core/src/model/identifier.rs @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -use std::{str::FromStr, convert::Infallible}; +use std::{convert::Infallible, str::FromStr}; use serde::{Deserialize, Serialize}; diff --git a/radix-engine-toolkit-core/src/requests/encode_address_request.rs b/radix-engine-toolkit-core/src/requests/encode_address_request.rs index da509b3f..ccb803ec 100644 --- a/radix-engine-toolkit-core/src/requests/encode_address_request.rs +++ b/radix-engine-toolkit-core/src/requests/encode_address_request.rs @@ -38,7 +38,7 @@ pub struct EncodeAddressRequest { #[derive(Serialize, Deserialize, Clone, Debug)] pub struct EncodeAddressResponse { #[serde(flatten)] - address: EntityAddress, + pub address: EntityAddress, } // =========== diff --git a/radix-engine-toolkit-core/tests/test_vector/manifest/mod.rs b/radix-engine-toolkit-core/tests/test_vector/manifest/mod.rs index 2b843f9b..663ffe82 100644 --- a/radix-engine-toolkit-core/tests/test_vector/manifest/mod.rs +++ b/radix-engine-toolkit-core/tests/test_vector/manifest/mod.rs @@ -379,7 +379,7 @@ lazy_static::lazy_static! { Value::Array { element_type: ValueKind::U8, elements: [5u8, 10u8, 255u8].iter().map(|x| Value::U8 { value: *x }).collect() }, ]) }, - + CallMethod { component_address: ScryptoReceiver::ComponentAddress(parse!("component_sim1q2f9vmyrmeladvz0ejfttcztqv3genlsgpu9vue83mcs835hum")), method_name: parse!("with_all_types"), @@ -400,41 +400,41 @@ lazy_static::lazy_static! { // Other interpreted types Value::Expression { value: Expression::new("ALL_WORKTOP_RESOURCES") }, Value::Blob { hash: parse!("36dae540b7889956f1f1d8d46ba23e5e44bf5723aef2a8e6b698686c02583618") }, - Value::NonFungibleAddress { address: NonFungibleAddress { - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), - non_fungible_id: NonFungibleId::String(parse!("value")) + Value::NonFungibleAddress { address: NonFungibleAddress { + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + non_fungible_id: NonFungibleId::String(parse!("value")) }}, - Value::NonFungibleAddress { address: NonFungibleAddress { - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + Value::NonFungibleAddress { address: NonFungibleAddress { + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), non_fungible_id: NonFungibleId::U32(123) }}, - Value::NonFungibleAddress { address: NonFungibleAddress { - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + Value::NonFungibleAddress { address: NonFungibleAddress { + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), non_fungible_id: NonFungibleId::U64(456) }}, - Value::NonFungibleAddress { address: NonFungibleAddress { - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + Value::NonFungibleAddress { address: NonFungibleAddress { + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), non_fungible_id: NonFungibleId::Bytes(hex::decode("031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f").unwrap()) }}, - Value::NonFungibleAddress { address: NonFungibleAddress { - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + Value::NonFungibleAddress { address: NonFungibleAddress { + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), non_fungible_id: NonFungibleId::UUID(1234567890) }}, // Uninterpreted - Value::Hash { + Value::Hash { value: parse!("2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824") }, - Value::EcdsaSecp256k1PublicKey { + Value::EcdsaSecp256k1PublicKey { public_key: parse!("0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798") }, - Value::EcdsaSecp256k1Signature { + Value::EcdsaSecp256k1Signature { signature: parse!("0079224ea514206706298d8d620f660828f7987068d6d02757e6f3cbbf4a51ab133395db69db1bc9b2726dd99e34efc252d8258dcb003ebaba42be349f50f7765e") }, - Value::EddsaEd25519PublicKey { + Value::EddsaEd25519PublicKey { public_key: parse!("4cb5abf6ad79fbf5abbccafcc269d85cd2651ed4b885b5869f241aedf0a5ba29") }, - Value::EddsaEd25519Signature { + Value::EddsaEd25519Signature { signature: parse!("ce993adc51111309a041faa65cbcf1154d21ed0ecdc2d54070bc90b9deb744aa8605b3f686fa178fba21070b4a4678e54eee3486a881e0e328251cd37966de09") }, Value::Decimal { value: parse!("1.2") }, @@ -455,34 +455,34 @@ lazy_static::lazy_static! { TransactionManifestTestVector::new( include_str!("./non_fungible_ids_canonical.rtm"), &[], - TransactionManifest { + TransactionManifest { instructions: ManifestInstructions::JSON(vec![ - TakeFromWorktopByIds { - ids: HashSet::from([NonFungibleId::U32(12)]), - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + TakeFromWorktopByIds { + ids: HashSet::from([NonFungibleId::U32(12)]), + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), into_bucket: Identifier::String(parse!("bucket1")).into() }, - TakeFromWorktopByIds { - ids: HashSet::from([NonFungibleId::U64(19)]), - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + TakeFromWorktopByIds { + ids: HashSet::from([NonFungibleId::U64(19)]), + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), into_bucket: Identifier::String(parse!("bucket2")).into() }, - TakeFromWorktopByIds { - ids: HashSet::from([NonFungibleId::String(parse!("HelloWorld"))]), - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + TakeFromWorktopByIds { + ids: HashSet::from([NonFungibleId::String(parse!("HelloWorld"))]), + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), into_bucket: Identifier::String(parse!("bucket3")).into() }, - TakeFromWorktopByIds { - ids: HashSet::from([NonFungibleId::Bytes(hex::decode("121922ff03").unwrap())]), - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + TakeFromWorktopByIds { + ids: HashSet::from([NonFungibleId::Bytes(hex::decode("121922ff03").unwrap())]), + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), into_bucket: Identifier::String(parse!("bucket4")).into() }, - TakeFromWorktopByIds { - ids: HashSet::from([NonFungibleId::UUID(1922931322)]), - resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), + TakeFromWorktopByIds { + ids: HashSet::from([NonFungibleId::UUID(1922931322)]), + resource_address: parse!("resource_sim1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzqu57yag"), into_bucket: Identifier::String(parse!("bucket5")).into() }, - ]), + ]), blobs: vec![] } ),