Skip to content

Commit 2dab6d6

Browse files
authored
feat: remove deprecated templates (#706)
1 parent 80a4c31 commit 2dab6d6

File tree

1 file changed

+2
-46
lines changed

1 file changed

+2
-46
lines changed

crates/pop-chains/src/templates.rs

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//! This module provides template definitions for different parachain configurations,
66
//! including providers like Pop, OpenZeppelin and Parity. It includes template metadata,
77
//! configuration options and utility functions for template management.
8-
#![expect(deprecated, reason = "Keep EVM and ParityContracts templates until v0.11.0")]
98
109
use pop_common::templates::{Template, Type};
1110
use strum::{EnumProperty as _, VariantArray};
@@ -124,23 +123,6 @@ pub enum ChainTemplate {
124123
)
125124
)]
126125
Contracts,
127-
/// Pop EVM Template: Parachain configured with Frontier, enabling compatibility with the
128-
/// Ethereum Virtual Machine (EVM).
129-
#[strum(
130-
serialize = "r0gue-io/evm-parachain",
131-
message = "EVM",
132-
detailed_message = "Parachain configured with Frontier, enabling compatibility with the Ethereum Virtual Machine (EVM).",
133-
props(
134-
Provider = "Pop",
135-
Repository = "https://github.com/r0gue-io/evm-parachain",
136-
Network = "./network.toml",
137-
License = "Unlicense",
138-
DeploymentName = "POP_EVM",
139-
IsDeprecated = "true",
140-
)
141-
)]
142-
#[deprecated(since = "0.10.0", note = "will be removed in v0.11.0")]
143-
EVM,
144126
/// OpenZeppelin Generic Runtime Template: A generic template for Substrate Runtime.
145127
#[strum(
146128
serialize = "openzeppelin/generic-template",
@@ -187,22 +169,6 @@ pub enum ChainTemplate {
187169
)
188170
)]
189171
ParityGeneric,
190-
/// Parity Contracts Template: Minimal Substrate node configured for smart contracts via
191-
/// pallet-contracts and pallet-revive.
192-
#[strum(
193-
serialize = "paritytech/substrate-contracts-node",
194-
message = "Contracts",
195-
detailed_message = "Minimal Substrate node configured for smart contracts via pallet-contracts and pallet-revive.",
196-
props(
197-
Provider = "Parity",
198-
Repository = "https://github.com/paritytech/substrate-contracts-node",
199-
Network = "./zombienet.toml",
200-
License = "Unlicense",
201-
IsDeprecated = "true",
202-
)
203-
)]
204-
#[deprecated(since = "0.10.0", note = "will be removed in v0.11.0")]
205-
ParityContracts,
206172
/// Test template 01 used for unit testing.
207173
#[cfg(test)]
208174
#[strum(
@@ -307,13 +273,11 @@ mod tests {
307273
("r0gue-io/base-parachain".to_string(), Standard),
308274
("r0gue-io/assets-parachain".to_string(), Assets),
309275
("r0gue-io/contracts-parachain".to_string(), Contracts),
310-
("r0gue-io/evm-parachain".to_string(), EVM),
311276
// openzeppelin
312277
("openzeppelin/generic-template".to_string(), OpenZeppelinGeneric),
313278
("openzeppelin/evm-template".to_string(), OpenZeppelinEVM),
314279
// pàrity
315280
("paritytech/polkadot-sdk-parachain-template".to_string(), ParityGeneric),
316-
("paritytech/substrate-contracts-node".to_string(), ParityContracts),
317281
("test_01".to_string(), TestTemplate01),
318282
("test_02".to_string(), TestTemplate02),
319283
])
@@ -324,11 +288,9 @@ mod tests {
324288
(Standard, "base-parachain".to_string()),
325289
(Assets, "assets-parachain".to_string()),
326290
(Contracts, "contracts-parachain".to_string()),
327-
(EVM, "evm-parachain".to_string()),
328291
(OpenZeppelinGeneric, "generic-template".to_string()),
329292
(OpenZeppelinEVM, "evm-template".to_string()),
330293
(ParityGeneric, "polkadot-sdk-parachain-template".to_string()),
331-
(ParityContracts, "substrate-contracts-node".to_string()),
332294
(TestTemplate01, "test_01".to_string()),
333295
(TestTemplate02, "test_02".to_string()),
334296
])
@@ -378,11 +340,9 @@ mod tests {
378340
(Standard, Some("./network.toml")),
379341
(Assets, Some("./network.toml")),
380342
(Contracts, Some("./network.toml")),
381-
(EVM, Some("./network.toml")),
382343
(OpenZeppelinGeneric, Some("./zombienet-config/devnet.toml")),
383344
(OpenZeppelinEVM, Some("./zombienet-config/devnet.toml")),
384345
(ParityGeneric, Some("./zombienet.toml")),
385-
(ParityContracts, Some("./zombienet.toml")),
386346
(TestTemplate01, Some("")),
387347
(TestTemplate02, Some("")),
388348
]
@@ -394,11 +354,9 @@ mod tests {
394354
(Standard, Some("Unlicense")),
395355
(Assets, Some("Unlicense")),
396356
(Contracts, Some("Unlicense")),
397-
(EVM, Some("Unlicense")),
398357
(OpenZeppelinGeneric, Some("GPL-3.0")),
399358
(OpenZeppelinEVM, Some("GPL-3.0")),
400359
(ParityGeneric, Some("Unlicense")),
401-
(ParityContracts, Some("Unlicense")),
402360
(TestTemplate01, Some("Unlicense")),
403361
(TestTemplate02, Some("GPL-3.0")),
404362
]
@@ -410,11 +368,9 @@ mod tests {
410368
(Standard, Some("POP_STANDARD")),
411369
(Assets, Some("POP_ASSETS")),
412370
(Contracts, Some("POP_CONTRACTS")),
413-
(EVM, Some("POP_EVM")),
414371
(OpenZeppelinGeneric, Some("OZ_GENERIC")),
415372
(OpenZeppelinEVM, Some("OZ_EVM")),
416373
(ParityGeneric, Some("PARITY_GENERIC")),
417-
(ParityContracts, None),
418374
(TestTemplate01, None),
419375
(TestTemplate02, None),
420376
]
@@ -424,11 +380,11 @@ mod tests {
424380
#[test]
425381
fn test_is_template_correct() {
426382
for template in ChainTemplate::VARIANTS {
427-
if matches!(template, Standard | Assets | Contracts | EVM) {
383+
if matches!(template, Standard | Assets | Contracts) {
428384
assert!(Provider::Pop.provides(template));
429385
assert!(!Provider::Parity.provides(template));
430386
}
431-
if matches!(template, ParityContracts | ParityGeneric) {
387+
if matches!(template, ParityGeneric) {
432388
assert!(!Provider::Pop.provides(template));
433389
assert!(Provider::Parity.provides(template))
434390
}

0 commit comments

Comments
 (0)