Rename receiver::v2::ReceiverState receiver::v2::State

Author: DanGould

payjoin/src/receive/v2/mod.rs

@@ -153,20 +153,20 @@ impl ReceiverTypeState {
     }
 }
 
-pub trait ReceiverState {}
+pub trait State {}
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Receiver<State: ReceiverState> {
+pub struct Receiver<State> {
     pub(crate) state: State,
 }
 
-impl<State: ReceiverState> core::ops::Deref for Receiver<State> {
+impl<State> core::ops::Deref for Receiver<State> {
     type Target = State;
 
     fn deref(&self) -> &Self::Target { &self.state }
 }
 
-impl<State: ReceiverState> core::ops::DerefMut for Receiver<State> {
+impl<State> core::ops::DerefMut for Receiver<State> {
     fn deref_mut(&mut self) -> &mut Self::Target { &mut self.state }
 }
 
@@ -202,7 +202,7 @@ pub fn process_err_res(body: &[u8], context: ohttp::ClientResponse) -> Result<()
 /// The receiver is not initialized yet, no session context is available yet
 pub struct UninitializedReceiver {}
 
-impl ReceiverState for UninitializedReceiver {}
+impl State for UninitializedReceiver {}
 
 impl Receiver<UninitializedReceiver> {
     /// Creates a new [`Receiver<Initialized>`] with the provided parameters.
@@ -250,7 +250,7 @@ pub struct Initialized {
     context: SessionContext,
 }
 
-impl ReceiverState for Initialized {}
+impl State for Initialized {}
 
 impl Receiver<Initialized> {
     /// Extract an OHTTP Encapsulated HTTP GET request for the Original PSBT
@@ -432,7 +432,7 @@ pub struct UncheckedProposal {
     pub(crate) context: SessionContext,
 }
 
-impl ReceiverState for UncheckedProposal {}
+impl State for UncheckedProposal {}
 
 impl Receiver<UncheckedProposal> {
     /// Call after checking that the Original PSBT can be broadcast.
@@ -503,7 +503,7 @@ pub struct MaybeInputsOwned {
     context: SessionContext,
 }
 
-impl ReceiverState for MaybeInputsOwned {}
+impl State for MaybeInputsOwned {}
 
 impl Receiver<MaybeInputsOwned> {
     /// The Sender's Original PSBT
@@ -554,7 +554,7 @@ pub struct MaybeInputsSeen {
     context: SessionContext,
 }
 
-impl ReceiverState for MaybeInputsSeen {}
+impl State for MaybeInputsSeen {}
 
 impl Receiver<MaybeInputsSeen> {
     /// Make sure that the original transaction inputs have never been seen before.
@@ -601,7 +601,7 @@ pub struct OutputsUnknown {
     context: SessionContext,
 }
 
-impl ReceiverState for OutputsUnknown {}
+impl State for OutputsUnknown {}
 
 impl Receiver<OutputsUnknown> {
     /// Find which outputs belong to the receiver
@@ -645,7 +645,7 @@ pub struct WantsOutputs {
     context: SessionContext,
 }
 
-impl ReceiverState for WantsOutputs {}
+impl State for WantsOutputs {}
 
 impl Receiver<WantsOutputs> {
     /// Whether the receiver is allowed to substitute original outputs or not.
@@ -699,7 +699,7 @@ pub struct WantsInputs {
     context: SessionContext,
 }
 
-impl ReceiverState for WantsInputs {}
+impl State for WantsInputs {}
 
 impl Receiver<WantsInputs> {
     /// Select receiver input such that the payjoin avoids surveillance.
@@ -762,7 +762,7 @@ pub struct ProvisionalProposal {
     context: SessionContext,
 }
 
-impl ReceiverState for ProvisionalProposal {}
+impl State for ProvisionalProposal {}
 
 impl Receiver<ProvisionalProposal> {
     /// Return a Payjoin Proposal PSBT that the sender will find acceptable.
@@ -810,7 +810,7 @@ pub struct PayjoinProposal {
     context: SessionContext,
 }
 
-impl ReceiverState for PayjoinProposal {}
+impl State for PayjoinProposal {}
 
 impl PayjoinProposal {
     #[cfg(feature = "_multiparty")]