Skip to content

Commit 400f1df

Browse files
authored
fix(template): fix log macros (#1298)
Description --- fixes `info!`, `warn!` and `error!` macros compile errors Support "inline" syntax for macros `info!("format {this}")` Motivation and Context --- Uses publicly-accessible modules in the macro-generated code. How Has This Been Tested? --- Added log calls to access rules unit tests What process can a PR reviewer use to test or verify this change? --- Use the log macros in templates Breaking Changes --- - [x] None - [ ] Requires data directory to be deleted - [ ] Other - Please specify
1 parent 79e2e6e commit 400f1df

File tree

3 files changed

+30
-19
lines changed
  • dan_layer

3 files changed

+30
-19
lines changed

dan_layer/engine/tests/templates/access_rules/src/lib.rs

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ mod access_rules_template {
4242
.initial_supply(1000);
4343

4444
let badges = create_badge_resource(recall_rule);
45+
info!("Badges resource address: {}", badges.resource_address());
4546

4647
Component::new(Self {
4748
value: 0,
@@ -94,6 +95,8 @@ mod access_rules_template {
9495
let badges = create_badge_resource(rule!(deny_all));
9596

9697
let address_alloc = CallerContext::allocate_component_address(None);
98+
let id = address_alloc.id();
99+
info!("Allocated address: {id}");
97100

98101
let tokens = ResourceBuilder::fungible()
99102
.with_authorization_hook(
@@ -119,14 +122,22 @@ mod access_rules_template {
119122

120123
let badge_resource = badges.resource_address();
121124
let tokens = ResourceBuilder::fungible()
122-
.mintable(rule!(non_fungible(
123-
NonFungibleAddress::new(badge_resource, NonFungibleId::from_string("mint")))))
124-
.burnable(rule!(non_fungible(
125-
NonFungibleAddress::new(badge_resource, NonFungibleId::from_string("burn")))))
126-
.withdrawable(rule!(non_fungible(
127-
NonFungibleAddress::new(badge_resource, NonFungibleId::from_string("withdraw")))))
128-
.depositable(rule!(non_fungible(
129-
NonFungibleAddress::new(badge_resource, NonFungibleId::from_string("deposit")))))
125+
.mintable(rule!(non_fungible(NonFungibleAddress::new(
126+
badge_resource,
127+
NonFungibleId::from_string("mint")
128+
))))
129+
.burnable(rule!(non_fungible(NonFungibleAddress::new(
130+
badge_resource,
131+
NonFungibleId::from_string("burn")
132+
))))
133+
.withdrawable(rule!(non_fungible(NonFungibleAddress::new(
134+
badge_resource,
135+
NonFungibleId::from_string("withdraw")
136+
))))
137+
.depositable(rule!(non_fungible(NonFungibleAddress::new(
138+
badge_resource,
139+
NonFungibleId::from_string("deposit")
140+
))))
130141
.initial_supply(1000);
131142

132143
Component::new(Self {

dan_layer/template_lib/src/macros.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,42 @@ macro_rules! debug {
2020
#[macro_export]
2121
macro_rules! log {
2222
($lvl:expr, $fmt:expr) => {
23-
$crate::engine::engine().emit_log($lvl, $fmt)
23+
$crate::engine().emit_log($lvl, format!($fmt))
2424
};
2525
($lvl:expr, $fmt:expr, $($args:tt)*) => {
26-
$crate::engine::engine().emit_log($lvl, format!($fmt, $($args)*))
26+
$crate::engine().emit_log($lvl, format!($fmt, $($args)*))
2727
};
2828
}
2929

3030
/// Macro for emitting log messages from inside templates
3131
#[macro_export]
3232
macro_rules! info {
3333
($fmt:expr) => {
34-
$crate::macros::log!($crate::args::LogLevel::Info, $fmt)
34+
$crate::log!($crate::args::LogLevel::Info, $fmt)
3535
};
3636
($fmt:expr, $($args:tt)*) => {
37-
$crate::macros::log!($crate::args::LogLevel::Info, $fmt, $($args)*)
37+
$crate::log!($crate::args::LogLevel::Info, $fmt, $($args)*)
3838
};
3939
}
4040

4141
/// Macro for emitting warn log messages from inside templates
4242
#[macro_export]
4343
macro_rules! warn {
4444
($fmt:expr) => {
45-
$crate::macros::log!($crate::args::LogLevel::Warn, $fmt)
45+
$crate::log!($crate::args::LogLevel::Warn, $fmt)
4646
};
4747
($fmt:expr, $($args:tt)*) => {
48-
$crate::macros::log!($crate::args::LogLevel::Warn, $fmt, $($args)*)
48+
$crate::log!($crate::args::LogLevel::Warn, $fmt, $($args)*)
4949
};
5050
}
5151

5252
/// Macro for emitting error log messages from inside templates
5353
#[macro_export]
5454
macro_rules! error {
5555
($fmt:expr) => {
56-
$crate::macros::log!($crate::args::LogLevel::Error, $fmt)
56+
$crate::log!($crate::args::LogLevel::Error, $fmt)
5757
};
5858
($fmt:expr, $($args:tt)*) => {
59-
$crate::macros::log!($crate::args::LogLevel::Error, $fmt, $($args)*)
59+
$crate::log!($crate::args::LogLevel::Error, $fmt, $($args)*)
6060
};
6161
}

dan_layer/template_test_tooling/templates/faucet/Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)