Skip to content

Commit 5ec16de

Browse files
DanGould0xZaddyy
andcommitted
Remove errant whitespace
Co-authored-by: oyindamola oladapo <[email protected]>
1 parent 5428ab9 commit 5ec16de

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

payjoin-ffi/python/test/test_payjoin_integration_test.py

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ async def process_receiver_proposal(self, receiver: ReceiveSession, recv_persist
6161
if res is None:
6262
return None
6363
return res
64-
64+
6565
if receiver.is_UNCHECKED_PROPOSAL():
6666
return await self.process_unchecked_proposal(receiver.inner, recv_persister)
6767
if receiver.is_MAYBE_INPUTS_OWNED():
@@ -78,56 +78,55 @@ async def process_receiver_proposal(self, receiver: ReceiveSession, recv_persist
7878
return await self.process_provisional_proposal(receiver.inner, recv_persister)
7979
if receiver.is_PAYJOIN_PROPOSAL():
8080
return receiver
81-
81+
8282
raise Exception(f"Unknown receiver state: {receiver}")
83-
84-
83+
8584
def create_receiver_context(self, receiver_address: bitcoinffi.Address, directory: Url, ohttp_keys: OhttpKeys, recv_persister: InMemoryReceiverSessionEventLog) -> Initialized:
8685
receiver = UninitializedReceiver().create_session(address=receiver_address, directory=directory.as_string(), ohttp_keys=ohttp_keys, expire_after=None).save(recv_persister)
8786
return receiver
88-
87+
8988
async def retrieve_receiver_proposal(self, receiver: Initialized, recv_persister: InMemoryReceiverSessionEventLog, ohttp_relay: Url):
9089
agent = httpx.AsyncClient()
91-
request: RequestResponse = receiver.extract_req(ohttp_relay.as_string())
90+
request: RequestResponse = receiver.create_poll_request(ohttp_relay.as_string())
9291
response = await agent.post(
9392
url=request.request.url.as_string(),
9493
headers={"Content-Type": request.request.content_type},
9594
content=request.request.body
9695
)
97-
res = receiver.process_res(response.content, request.client_response).save(recv_persister)
96+
res = receiver.process_response(response.content, request.client_response).save(recv_persister)
9897
if res.is_none():
9998
return None
10099
proposal = res.success()
101100
return await self.process_unchecked_proposal(proposal, recv_persister)
102-
101+
103102
async def process_unchecked_proposal(self, proposal: UncheckedProposal, recv_persister: InMemoryReceiverSessionEventLog) :
104103
receiver = proposal.check_broadcast_suitability(None, MempoolAcceptanceCallback(self.receiver)).save(recv_persister)
105104
return await self.process_maybe_inputs_owned(receiver, recv_persister)
106-
105+
107106
async def process_maybe_inputs_owned(self, proposal: MaybeInputsOwned, recv_persister: InMemoryReceiverSessionEventLog):
108107
maybe_inputs_owned = proposal.check_inputs_not_owned(IsScriptOwnedCallback(self.receiver)).save(recv_persister)
109108
return await self.process_maybe_inputs_seen(maybe_inputs_owned, recv_persister)
110-
109+
111110
async def process_maybe_inputs_seen(self, proposal: MaybeInputsSeen, recv_persister: InMemoryReceiverSessionEventLog):
112111
outputs_unknown = proposal.check_no_inputs_seen_before(CheckInputsNotSeenCallback(self.receiver)).save(recv_persister)
113112
return await self.process_outputs_unknown(outputs_unknown, recv_persister)
114-
113+
115114
async def process_outputs_unknown(self, proposal: OutputsUnknown, recv_persister: InMemoryReceiverSessionEventLog):
116115
wants_outputs = proposal.identify_receiver_outputs(IsScriptOwnedCallback(self.receiver)).save(recv_persister)
117116
return await self.process_wants_outputs(wants_outputs, recv_persister)
118-
117+
119118
async def process_wants_outputs(self, proposal: WantsOutputs, recv_persister: InMemoryReceiverSessionEventLog):
120119
wants_inputs = proposal.commit_outputs().save(recv_persister)
121120
return await self.process_wants_inputs(wants_inputs, recv_persister)
122-
121+
123122
async def process_wants_inputs(self, proposal: WantsInputs, recv_persister: InMemoryReceiverSessionEventLog):
124123
provisional_proposal = proposal.contribute_inputs(get_inputs(self.receiver)).commit_inputs().save(recv_persister)
125124
return await self.process_provisional_proposal(provisional_proposal, recv_persister)
126-
125+
127126
async def process_provisional_proposal(self, proposal: ProvisionalProposal, recv_persister: InMemoryReceiverSessionEventLog):
128127
payjoin_proposal = proposal.finalize_proposal(ProcessPsbtCallback(self.receiver), 1, 10).save(recv_persister)
129128
return ReceiveSession.PAYJOIN_PROPOSAL(payjoin_proposal)
130-
129+
131130
async def test_integration_v2_to_v2(self):
132131
try:
133132
receiver_address = bitcoinffi.Address(json.loads(self.receiver.call("getnewaddress", [])), bitcoinffi.Network.REGTEST)
@@ -254,7 +253,7 @@ def callback(self, tx):
254253
return res
255254
except Exception as e:
256255
print(f"An error occurred: {e}")
257-
return None
256+
return None
258257

259258
class IsScriptOwnedCallback(IsScriptOwned):
260259
def __init__(self, connection: RpcClient):
@@ -280,7 +279,7 @@ def __init__(self, connection: RpcClient):
280279
self.connection = connection
281280

282281
def callback(self, psbt: str):
283-
res = json.loads(self.connection.call("walletprocesspsbt", [psbt]))
282+
res = json.loads(self.connection.call("walletprocesspsbt", [psbt]))
284283
return res['psbt']
285284

286285
if __name__ == "__main__":

0 commit comments

Comments
 (0)