chore!: deprecate `Period::years` and `months` constructors

This commit is contained in:
gibbz00 2024-10-21 16:54:00 +02:00 committed by Dirkjan Ochtman
parent 19ea27c38d
commit ef1746cb85
6 changed files with 22 additions and 23 deletions

View File

@ -90,7 +90,7 @@ mod tests {
use chrono::{TimeZone, Utc}; use chrono::{TimeZone, Utc};
use super::{DomainContact, DomainCreate, Period}; use super::{DomainContact, DomainCreate, Period};
use crate::domain::{HostAttr, HostInfo, HostObj}; use crate::domain::{HostAttr, HostInfo, HostObj, PeriodLength};
use crate::response::ResultCode; use crate::response::ResultCode;
use crate::tests::{assert_serialized, response_from_file, CLTRID, SUCCESS_MSG, SVTRID}; use crate::tests::{assert_serialized, response_from_file, CLTRID, SUCCESS_MSG, SVTRID};
@ -113,7 +113,7 @@ mod tests {
let object = DomainCreate::new( let object = DomainCreate::new(
"eppdev-1.com", "eppdev-1.com",
Period::years(1).unwrap(), Period::Years(PeriodLength::new(1).unwrap()),
None, None,
Some("eppdev-contact-3"), Some("eppdev-contact-3"),
"epP4uthd#v", "epP4uthd#v",
@ -150,7 +150,7 @@ mod tests {
]; ];
let object = DomainCreate::new( let object = DomainCreate::new(
"eppdev-1.com", "eppdev-1.com",
Period::years(1).unwrap(), Period::Years(PeriodLength::new(1).unwrap()),
Some(hosts), Some(hosts),
Some("eppdev-contact-3"), Some("eppdev-contact-3"),
"epP4uthd#v", "epP4uthd#v",
@ -193,7 +193,7 @@ mod tests {
let object = DomainCreate::new( let object = DomainCreate::new(
"eppdev-2.com", "eppdev-2.com",
Period::years(1).unwrap(), Period::Years(PeriodLength::new(1).unwrap()),
Some(hosts), Some(hosts),
Some("eppdev-contact-3"), Some("eppdev-contact-3"),
"epP4uthd#v", "epP4uthd#v",

View File

@ -170,16 +170,6 @@ impl PeriodLength {
} }
} }
impl Period {
pub fn years(length: u8) -> Result<Self, Error> {
PeriodLength::new(length).map(Self::Years)
}
pub fn months(length: u8) -> Result<Self, Error> {
PeriodLength::new(length).map(Self::Months)
}
}
impl ToXml for Period { impl ToXml for Period {
fn serialize<W: fmt::Write + ?Sized>( fn serialize<W: fmt::Write + ?Sized>(
&self, &self,

View File

@ -66,6 +66,7 @@ pub struct RenewData {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::{DomainRenew, Period}; use super::{DomainRenew, Period};
use crate::domain::PeriodLength;
use crate::response::ResultCode; use crate::response::ResultCode;
use crate::tests::{assert_serialized, response_from_file, CLTRID, SUCCESS_MSG, SVTRID}; use crate::tests::{assert_serialized, response_from_file, CLTRID, SUCCESS_MSG, SVTRID};
@ -74,7 +75,11 @@ mod tests {
#[test] #[test]
fn command() { fn command() {
let exp_date = NaiveDate::from_ymd_opt(2022, 7, 23).unwrap(); let exp_date = NaiveDate::from_ymd_opt(2022, 7, 23).unwrap();
let object = DomainRenew::new("eppdev.com", exp_date, Period::years(1).unwrap()); let object = DomainRenew::new(
"eppdev.com",
exp_date,
Period::Years(PeriodLength::new(1).unwrap()),
);
assert_serialized("request/domain/renew.xml", &object); assert_serialized("request/domain/renew.xml", &object);
} }

View File

@ -124,13 +124,17 @@ mod tests {
use chrono::{TimeZone, Utc}; use chrono::{TimeZone, Utc};
use super::{DomainTransfer, Period}; use super::{DomainTransfer, Period};
use crate::domain::PeriodLength;
use crate::response::ResultCode; use crate::response::ResultCode;
use crate::tests::{assert_serialized, response_from_file, CLTRID, SUCCESS_MSG, SVTRID}; use crate::tests::{assert_serialized, response_from_file, CLTRID, SUCCESS_MSG, SVTRID};
#[test] #[test]
fn request_command() { fn request_command() {
let object = let object = DomainTransfer::new(
DomainTransfer::new("testing.com", Some(Period::years(1).unwrap()), "epP4uthd#v"); "testing.com",
Some(Period::Years(PeriodLength::new(1).unwrap())),
"epP4uthd#v",
);
assert_serialized("request/domain/transfer_request.xml", &object); assert_serialized("request/domain/transfer_request.xml", &object);
} }

View File

@ -371,7 +371,7 @@ impl ToXml for Protocol {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::domain; use crate::domain::{self, Period, PeriodLength};
use crate::tests::assert_serialized; use crate::tests::assert_serialized;
#[test] #[test]
@ -404,7 +404,7 @@ mod tests {
]; ];
let object = domain::DomainCreate::new( let object = domain::DomainCreate::new(
"example.com", "example.com",
domain::Period::years(2).unwrap(), Period::Years(PeriodLength::new(2).unwrap()),
Some(&ns), Some(&ns),
Some("jd1234"), Some("jd1234"),
"2fooBAR", "2fooBAR",
@ -452,7 +452,7 @@ mod tests {
]; ];
let object = domain::DomainCreate::new( let object = domain::DomainCreate::new(
"example.com", "example.com",
domain::Period::years(2).unwrap(), Period::Years(PeriodLength::new(2).unwrap()),
Some(&ns), Some(&ns),
Some("jd1234"), Some("jd1234"),
"2fooBAR", "2fooBAR",
@ -493,7 +493,7 @@ mod tests {
]; ];
let object = domain::DomainCreate::new( let object = domain::DomainCreate::new(
"example.com", "example.com",
domain::Period::years(2).unwrap(), Period::Years(PeriodLength::new(2).unwrap()),
Some(&ns), Some(&ns),
Some("jd1234"), Some("jd1234"),
"2fooBAR", "2fooBAR",

View File

@ -9,7 +9,7 @@ use tokio::time::timeout;
use tokio_test::io::Builder; use tokio_test::io::Builder;
use instant_epp::client::{Connector, EppClient}; use instant_epp::client::{Connector, EppClient};
use instant_epp::domain::{DomainCheck, DomainContact, DomainCreate, Period}; use instant_epp::domain::{DomainCheck, DomainContact, DomainCreate, Period, PeriodLength};
use instant_epp::login::Login; use instant_epp::login::Login;
use instant_epp::response::ResultCode; use instant_epp::response::ResultCode;
use instant_epp::Error; use instant_epp::Error;
@ -232,7 +232,7 @@ async fn dropped() {
// remainder of the in-flight request before starting the new one, and succeed. // remainder of the in-flight request before starting the new one, and succeed.
let create = DomainCreate::new( let create = DomainCreate::new(
"eppdev-1.com", "eppdev-1.com",
Period::years(1).unwrap(), Period::Years(PeriodLength::new(1).unwrap()),
None, None,
Some("eppdev-contact-3"), Some("eppdev-contact-3"),
"epP4uthd#v", "epP4uthd#v",