locktime: Add inline to public functions
Add `#[inline]` to all public functions/methods excluding error types and `Display` impls. Error paths do not need to be fast and presumably `Display` is called on code paths that do IO so this also does not need to be fast.
This commit is contained in:
parent
c92591e645
commit
26c0da41b4
|
@ -226,6 +226,7 @@ impl LockTime {
|
||||||
/// let check = LockTime::from_consensus(100 + 1);
|
/// let check = LockTime::from_consensus(100 + 1);
|
||||||
/// assert!(lock_time.is_implied_by(check));
|
/// assert!(lock_time.is_implied_by(check));
|
||||||
/// ```
|
/// ```
|
||||||
|
#[inline]
|
||||||
pub fn is_implied_by(&self, other: LockTime) -> bool {
|
pub fn is_implied_by(&self, other: LockTime) -> bool {
|
||||||
use LockTime::*;
|
use LockTime::*;
|
||||||
|
|
||||||
|
@ -273,18 +274,21 @@ impl LockTime {
|
||||||
impl_parse_str_through_int!(LockTime, from_consensus);
|
impl_parse_str_through_int!(LockTime, from_consensus);
|
||||||
|
|
||||||
impl From<Height> for LockTime {
|
impl From<Height> for LockTime {
|
||||||
|
#[inline]
|
||||||
fn from(h: Height) -> Self {
|
fn from(h: Height) -> Self {
|
||||||
LockTime::Blocks(h)
|
LockTime::Blocks(h)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<Time> for LockTime {
|
impl From<Time> for LockTime {
|
||||||
|
#[inline]
|
||||||
fn from(t: Time) -> Self {
|
fn from(t: Time) -> Self {
|
||||||
LockTime::Seconds(t)
|
LockTime::Seconds(t)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PartialOrd for LockTime {
|
impl PartialOrd for LockTime {
|
||||||
|
#[inline]
|
||||||
fn partial_cmp(&self, other: &LockTime) -> Option<Ordering> {
|
fn partial_cmp(&self, other: &LockTime) -> Option<Ordering> {
|
||||||
use LockTime::*;
|
use LockTime::*;
|
||||||
|
|
||||||
|
@ -317,6 +321,7 @@ impl fmt::Display for LockTime {
|
||||||
impl FromHexStr for LockTime {
|
impl FromHexStr for LockTime {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
fn from_hex_str_no_prefix<S: AsRef<str> + Into<String>>(s: S) -> Result<Self, Self::Error> {
|
fn from_hex_str_no_prefix<S: AsRef<str> + Into<String>>(s: S) -> Result<Self, Self::Error> {
|
||||||
let packed_lock_time = crate::parse::hex_u32(s)?;
|
let packed_lock_time = crate::parse::hex_u32(s)?;
|
||||||
Ok(Self::from_consensus(packed_lock_time))
|
Ok(Self::from_consensus(packed_lock_time))
|
||||||
|
@ -431,6 +436,7 @@ impl fmt::Display for Height {
|
||||||
impl FromHexStr for Height {
|
impl FromHexStr for Height {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
fn from_hex_str_no_prefix<S: AsRef<str> + Into<String>>(s: S) -> Result<Self, Self::Error> {
|
fn from_hex_str_no_prefix<S: AsRef<str> + Into<String>>(s: S) -> Result<Self, Self::Error> {
|
||||||
let height = crate::parse::hex_u32(s)?;
|
let height = crate::parse::hex_u32(s)?;
|
||||||
Self::from_consensus(height)
|
Self::from_consensus(height)
|
||||||
|
@ -441,6 +447,7 @@ impl FromHexStr for Height {
|
||||||
impl FromStr for Height {
|
impl FromStr for Height {
|
||||||
type Err = Error;
|
type Err = Error;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||||
let n = parse::int(s)?;
|
let n = parse::int(s)?;
|
||||||
Height::from_consensus(n)
|
Height::from_consensus(n)
|
||||||
|
@ -450,6 +457,7 @@ impl FromStr for Height {
|
||||||
impl TryFrom<&str> for Height {
|
impl TryFrom<&str> for Height {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
fn try_from(s: &str) -> Result<Self, Self::Error> {
|
fn try_from(s: &str) -> Result<Self, Self::Error> {
|
||||||
let n = parse::int(s)?;
|
let n = parse::int(s)?;
|
||||||
Height::from_consensus(n)
|
Height::from_consensus(n)
|
||||||
|
@ -459,6 +467,7 @@ impl TryFrom<&str> for Height {
|
||||||
impl TryFrom<String> for Height {
|
impl TryFrom<String> for Height {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
fn try_from(s: String) -> Result<Self, Self::Error> {
|
fn try_from(s: String) -> Result<Self, Self::Error> {
|
||||||
let n = parse::int(s)?;
|
let n = parse::int(s)?;
|
||||||
Height::from_consensus(n)
|
Height::from_consensus(n)
|
||||||
|
@ -524,6 +533,7 @@ impl fmt::Display for Time {
|
||||||
impl FromHexStr for Time {
|
impl FromHexStr for Time {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
fn from_hex_str_no_prefix<S: AsRef<str> + Into<String>>(s: S) -> Result<Self, Self::Error> {
|
fn from_hex_str_no_prefix<S: AsRef<str> + Into<String>>(s: S) -> Result<Self, Self::Error> {
|
||||||
let time = crate::parse::hex_u32(s)?;
|
let time = crate::parse::hex_u32(s)?;
|
||||||
Time::from_consensus(time)
|
Time::from_consensus(time)
|
||||||
|
@ -533,6 +543,7 @@ impl FromHexStr for Time {
|
||||||
impl FromStr for Time {
|
impl FromStr for Time {
|
||||||
type Err = Error;
|
type Err = Error;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||||
let n = parse::int(s)?;
|
let n = parse::int(s)?;
|
||||||
Time::from_consensus(n)
|
Time::from_consensus(n)
|
||||||
|
@ -542,6 +553,7 @@ impl FromStr for Time {
|
||||||
impl TryFrom<&str> for Time {
|
impl TryFrom<&str> for Time {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
fn try_from(s: &str) -> Result<Self, Self::Error> {
|
fn try_from(s: &str) -> Result<Self, Self::Error> {
|
||||||
let n = parse::int(s)?;
|
let n = parse::int(s)?;
|
||||||
Time::from_consensus(n)
|
Time::from_consensus(n)
|
||||||
|
@ -551,6 +563,7 @@ impl TryFrom<&str> for Time {
|
||||||
impl TryFrom<String> for Time {
|
impl TryFrom<String> for Time {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
fn try_from(s: String) -> Result<Self, Self::Error> {
|
fn try_from(s: String) -> Result<Self, Self::Error> {
|
||||||
let n = parse::int(s)?;
|
let n = parse::int(s)?;
|
||||||
Time::from_consensus(n)
|
Time::from_consensus(n)
|
||||||
|
@ -606,18 +619,21 @@ impl std::error::Error for Error {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<ConversionError> for Error {
|
impl From<ConversionError> for Error {
|
||||||
|
#[inline]
|
||||||
fn from(e: ConversionError) -> Self {
|
fn from(e: ConversionError) -> Self {
|
||||||
Error::Conversion(e)
|
Error::Conversion(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<OperationError> for Error {
|
impl From<OperationError> for Error {
|
||||||
|
#[inline]
|
||||||
fn from(e: OperationError) -> Self {
|
fn from(e: OperationError) -> Self {
|
||||||
Error::Operation(e)
|
Error::Operation(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<ParseIntError> for Error {
|
impl From<ParseIntError> for Error {
|
||||||
|
#[inline]
|
||||||
fn from(e: ParseIntError) -> Self {
|
fn from(e: ParseIntError) -> Self {
|
||||||
Error::Parse(e)
|
Error::Parse(e)
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,6 +52,7 @@ impl LockTime {
|
||||||
/// let height_and_time = (current_time(), current_height()); // tuple order does not matter.
|
/// let height_and_time = (current_time(), current_height()); // tuple order does not matter.
|
||||||
/// assert!(lock.is_satisfied_by(current_height(), current_time()));
|
/// assert!(lock.is_satisfied_by(current_height(), current_time()));
|
||||||
/// ```
|
/// ```
|
||||||
|
#[inline]
|
||||||
pub fn is_satisfied_by(&self, h: Height, t: Time) -> bool {
|
pub fn is_satisfied_by(&self, h: Height, t: Time) -> bool {
|
||||||
if let Ok(true) = self.is_satisfied_by_height(h) {
|
if let Ok(true) = self.is_satisfied_by_height(h) {
|
||||||
true
|
true
|
||||||
|
@ -92,6 +93,7 @@ impl LockTime {
|
||||||
/// };
|
/// };
|
||||||
/// assert!(satisfied);
|
/// assert!(satisfied);
|
||||||
/// ```
|
/// ```
|
||||||
|
#[inline]
|
||||||
pub fn is_implied_by(&self, other: LockTime) -> bool {
|
pub fn is_implied_by(&self, other: LockTime) -> bool {
|
||||||
use LockTime::*;
|
use LockTime::*;
|
||||||
|
|
||||||
|
@ -170,7 +172,6 @@ impl From<Time> for LockTime {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl fmt::Display for LockTime {
|
impl fmt::Display for LockTime {
|
||||||
#[inline]
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
use LockTime::*;
|
use LockTime::*;
|
||||||
|
|
||||||
|
@ -210,7 +211,6 @@ impl From<u16> for Height {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl fmt::Display for Height {
|
impl fmt::Display for Height {
|
||||||
#[inline]
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
fmt::Display::fmt(&self.0, f)
|
fmt::Display::fmt(&self.0, f)
|
||||||
}
|
}
|
||||||
|
@ -256,7 +256,6 @@ impl Time {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl fmt::Display for Time {
|
impl fmt::Display for Time {
|
||||||
#[inline]
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
fmt::Display::fmt(&self.0, f)
|
fmt::Display::fmt(&self.0, f)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue