Skip to content

Commit 7b525c0

Browse files
remove PAUSED and ADMIN consts, use inline strings
1 parent bd1a5e6 commit 7b525c0

File tree

1 file changed

+16
-28
lines changed

1 file changed

+16
-28
lines changed

soroban-sdk/src/_migrating/v25_contracttrait.rs

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,31 +58,27 @@
5858
//! // Define a contracttrait with default implementations that require RequireAdmin
5959
//! #[contracttrait]
6060
//! pub trait Pausable: RequireAdmin {
61-
//! const PAUSED: &'static str = "paused";
62-
//!
6361
//! fn is_paused(env: &Env) -> bool {
64-
//! env.storage().instance().has(&Self::PAUSED)
62+
//! env.storage().instance().has(&"paused")
6563
//! }
6664
//!
6765
//! fn pause(env: &Env) {
6866
//! Self::require_admin(env);
69-
//! env.storage().instance().set(&Self::PAUSED, &true);
67+
//! env.storage().instance().set(&"paused", &true);
7068
//! }
7169
//!
7270
//! fn unpause(env: &Env) {
7371
//! Self::require_admin(env);
74-
//! env.storage().instance().remove(&Self::PAUSED);
72+
//! env.storage().instance().remove(&"paused");
7573
//! }
7674
//! }
7775
//!
7876
//! #[contract]
7977
//! pub struct MyContract;
8078
//!
81-
//! const ADMIN: &str = "admin";
82-
//!
8379
//! impl RequireAdmin for MyContract {
8480
//! fn require_admin(env: &Env) {
85-
//! let admin: Address = env.storage().instance().get(&ADMIN).unwrap();
81+
//! let admin: Address = env.storage().instance().get(&"admin").unwrap();
8682
//! admin.require_auth();
8783
//! }
8884
//! }
@@ -94,7 +90,7 @@
9490
//! #[contractimpl]
9591
//! impl MyContract {
9692
//! pub fn __constructor(env: &Env, admin: Address) {
97-
//! env.storage().instance().set(&ADMIN, &admin);
93+
//! env.storage().instance().set(&"admin", &admin);
9894
//! }
9995
//!
10096
//! pub fn do_something(env: &Env) {
@@ -122,31 +118,27 @@
122118
//! // Define a contracttrait with default implementations that require RequireAdmin
123119
//! #[contracttrait]
124120
//! pub trait Pausable: RequireAdmin {
125-
//! const PAUSED: &'static str = "paused";
126-
//!
127121
//! fn is_paused(env: &Env) -> bool {
128-
//! env.storage().instance().has(&Self::PAUSED)
122+
//! env.storage().instance().has(&"paused")
129123
//! }
130124
//!
131125
//! fn pause(env: &Env) {
132126
//! Self::require_admin(env);
133-
//! env.storage().instance().set(&Self::PAUSED, &true);
127+
//! env.storage().instance().set(&"paused", &true);
134128
//! }
135129
//!
136130
//! fn unpause(env: &Env) {
137131
//! Self::require_admin(env);
138-
//! env.storage().instance().remove(&Self::PAUSED);
132+
//! env.storage().instance().remove(&"paused");
139133
//! }
140134
//! }
141135
//!
142136
//! #[contract]
143137
//! pub struct MyContract;
144138
//!
145-
//! const ADMIN: &str = "admin";
146-
//!
147139
//! impl RequireAdmin for MyContract {
148140
//! fn require_admin(env: &Env) {
149-
//! let admin: Address = env.storage().instance().get(&ADMIN).unwrap();
141+
//! let admin: Address = env.storage().instance().get(&"admin").unwrap();
150142
//! admin.require_auth();
151143
//! }
152144
//! }
@@ -156,15 +148,15 @@
156148
//! impl Pausable for MyContract {
157149
//! // Override is_paused with custom logic that returns false when not set
158150
//! fn is_paused(env: &Env) -> bool {
159-
//! env.storage().instance().get(&Self::PAUSED).unwrap_or(false)
151+
//! env.storage().instance().get(&"paused").unwrap_or(false)
160152
//! }
161153
//! // pause() and unpause() use the default implementations
162154
//! }
163155
//!
164156
//! #[contractimpl]
165157
//! impl MyContract {
166158
//! pub fn __constructor(env: &Env, admin: Address) {
167-
//! env.storage().instance().set(&ADMIN, &admin);
159+
//! env.storage().instance().set(&"admin", &admin);
168160
//! }
169161
//!
170162
//! pub fn do_something(env: &Env) {
@@ -192,31 +184,27 @@
192184
//! // Define a contracttrait with default implementations that require RequireAdmin
193185
//! #[contracttrait]
194186
//! pub trait Pausable: RequireAdmin {
195-
//! const PAUSED: &'static str = "paused";
196-
//!
197187
//! fn is_paused(env: &Env) -> bool {
198-
//! env.storage().instance().has(&Self::PAUSED)
188+
//! env.storage().instance().has(&"paused")
199189
//! }
200190
//!
201191
//! fn pause(env: &Env) {
202192
//! Self::require_admin(env);
203-
//! env.storage().instance().set(&Self::PAUSED, &true);
193+
//! env.storage().instance().set(&"paused", &true);
204194
//! }
205195
//!
206196
//! fn unpause(env: &Env) {
207197
//! Self::require_admin(env);
208-
//! env.storage().instance().remove(&Self::PAUSED);
198+
//! env.storage().instance().remove(&"paused");
209199
//! }
210200
//! }
211201
//!
212202
//! #[contract]
213203
//! pub struct MyContract;
214204
//!
215-
//! const ADMIN: &str = "admin";
216-
//!
217205
//! impl RequireAdmin for MyContract {
218206
//! fn require_admin(env: &Env) {
219-
//! let admin: Address = env.storage().instance().get(&ADMIN).unwrap();
207+
//! let admin: Address = env.storage().instance().get(&"admin").unwrap();
220208
//! admin.require_auth();
221209
//! }
222210
//! }
@@ -228,7 +216,7 @@
228216
//! #[contractimpl]
229217
//! impl MyContract {
230218
//! pub fn __constructor(env: &Env, admin: Address) {
231-
//! env.storage().instance().set(&ADMIN, &admin);
219+
//! env.storage().instance().set(&"admin", &admin);
232220
//! }
233221
//!
234222
//! pub fn do_something(env: &Env) {

0 commit comments

Comments
 (0)