Skip to content
This repository has been archived by the owner on Aug 2, 2021. It is now read-only.

swap: segregate api code and tests #1883

Merged
merged 135 commits into from
Nov 13, 2019
Merged

swap: segregate api code and tests #1883

merged 135 commits into from
Nov 13, 2019

Conversation

mortelli
Copy link
Contributor

@mortelli mortelli commented Oct 16, 2019 •
edited
Loading

This PR:

  • moves SWAP API code (and its related tests) to the new files api.go and api_test.go
  • renames the function Balance to PeerBalance for consistency

closes #1882

@mortelli
swap: add PeerCheques function to swapAPI and Swap struct
2938485
@mortelli
swap: change PeerCheques signature so that it is callable through RPC
35b9f23
@mortelli
swap: first working Cheques implementation
7db5774
@mortelli
swap: fix deadlock in Cheques
ea1a291
@mortelli
Merge remote-tracking branch 'origin/master' into swap-query-cheque-info
ab7d4af
@mortelli
swap: fix impossible condition in Cheques function
a9af5e1
@mortelli
Merge remote-tracking branch 'origin/master' into swap-query-cheque-info
bc9dbde
@mortelli
swap: update comments in swapAPI functions
8e6cc20
@mortelli
swap: rename tests for consistency
589579b
@mortelli
swap: start re-implementing Cheques function
6345406
@mortelli
swap: add TestReceivedCheques function
137efc8
@mortelli
swap: iterate TestSentCheques
db019a8
@mortelli
swap: refactor TestSentCheques, TestReceivedCheques and testCheques f…
0b91f32 
…unctions
@mortelli
swap: add TestPeerCheques and testLastCheques functions
b4daa5a
@mortelli
swap: add additiona lerror checks to TestBalance function
2e72bcf
@mortelli
swap: add additional error checks to TestBalances function
1df044e
@mortelli
swap: add additional error checks to TestSentCheques function
d1f42cc
@mortelli
swap: add additional error checks to TestReceivedCheques function
de08de5
@mortelli
swap: iterate TestPeerCheques function
5418acb
@mortelli
swap: update comments in swap tests for consistency
d08c45d
@mortelli
swap: iterate TestPeerCheques
9136a66
@mortelli
swap: iterate TestPeerCheques
48bb5dd
@mortelli
swap: iterate TestPeerCheques
941eb59
@mortelli
swap: iterate TestPeerCheques and PeerCheques functions
e655c46
@mortelli
swap: iterate Cheques function
93948c9
@mortelli
swap: extract lastSentChequeKey and lastReceivedChequeKey consts
c2b0c87
@mortelli
Merge remote-tracking branch 'origin/master' into swap-query-cheque-info
6ba118b
@mortelli
swap: fix bug in PeerCheques that returned error when only one of the…
127f6f5 
… cheques was nil
@mortelli
swap: minor refactor to swap cheques tests
73ac500
@mortelli
swap: fix bugs in Cheques function, iterate TestCheques function, ref…
d338ee1 
…actor swap tests cheques
@mortelli
swap: reorganize swap tests locations
fbdd8fe
@mortelli
Merge remote-tracking branch 'origin/master' into swap-improve-balanc…
ce9b062 
…e-tests
@mortelli
Merge remote-tracking branch 'origin/master' into swap-improve-balanc…
fe5662c 
…e-tests
@mortelli
Merge remote-tracking branch 'origin/swap-improve-balance-tests' into…
e0174a9 
… swap-segregate-api
@mortelli
Merge remote-tracking branch 'origin/master' into swap-improve-balanc…
87ae811 
…e-tests
@mortelli
Merge remote-tracking branch 'origin/swap-improve-balance-tests' into…
8efe2dc 
… swap-segregate-api
@mortelli
Merge remote-tracking branch 'origin/master' into swap-improve-balanc…
9bb8288 
…e-tests
@mortelli
Merge remote-tracking branch 'origin/swap-improve-balance-tests' into…
98cde16 
… swap-segregate-api

# Conflicts:
#	swap/swap.go
#	swap/swap_test.go
@mortelli mortelli added in progress and removed builds on open PR Builds on a PR that is not yet merged. It is blocked until then and the diff won't make sense yet. do-not-merge on hold labels Nov 5, 2019
@mortelli mortelli marked this pull request as ready for review November 5, 2019 19:48
@mortelli
Copy link
Contributor Author

mortelli commented Nov 5, 2019 •
edited
Loading

note: builds are failing due to know simulation bugs.

once fixed, pulling from master should correct this.

@mortelli mortelli merged commit 31d1893 into master Nov 13, 2019
@mortelli mortelli deleted the swap-segregate-api branch November 13, 2019 16:07
@acud acud added this to the 0.5.3 milestone Nov 25, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@holisticode holisticode holisticode approved these changes

@Eknir Eknir Eknir approved these changes

@ralph-pichler ralph-pichler Awaiting requested review from ralph-pichler

Assignees

@mortelli mortelli

Labels
cleanup code completion, add comments and more incentives ready for review
Projects
None yet
Milestone
0.5.3
Development

Successfully merging this pull request may close these issues.

segregate SWAP API functions and tests from business logic
4 participants
@mortelli @holisticode @Eknir @acud