Merge rust-bitcoin#4857: fix: IsSatisfiedByTimeError::Incompatible wording to lock-by-time

1f5e6ed fix: IsSatisfiedByTimeError::Incompatible wording to lock-by-time (yyhrnk)

Pull request description:

  Updated the error text to say “lock-by-time” for IsSatisfiedByTimeError::Incompatible.


ACKs for top commit:
  apoelstra:
    ACK 1f5e6ed; successfully ran local tests; good catch
  tcharding:
    ACK 1f5e6ed


Tree-SHA512: b88513592e81cf149ef7c225a45bca4641577670b5f48c404d94989fb9b8474cef50eaab03da1bddcbac1fe3879525f91ac97e57c217b763883ec466a066c3c8

Author: apoelstra

units/src/locktime/relative/error.rs

@@ -116,7 +116,7 @@ impl fmt::Display for IsSatisfiedByTimeError {
         match *self {
             E::Satisfaction(ref e) => write_err!(f, "satisfaction"; e),
             E::Incompatible(blocks) =>
-                write!(f, "tried to satisfy a lock-by-height locktime using blocks {}", blocks),
+                write!(f, "tried to satisfy a lock-by-time locktime using blocks {}", blocks),
         }
     }
 }