New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3630 settlement fixes network orders #3704

Merged

jeremyletang merged 17 commits into develop from 3630-settlement-fixes-network-orders

Jul 8, 2021

Contributor

EVODelavega commented Jul 6, 2021 •

edited by jeremyletang

close #3630

peterbarrow and others added 5 commits

July 6, 2021 14:30


          Stubs for first attempt fixes

44a38be


          Update collateral engine to handle network market positions for MTM t…

f1642e1

…ransfers


          Add unit tests for network in MTM

c30ae7a


          Distributor floors the amounts, in case the network is the only winni…

5bc36c5

…ng party, we might have a mismatch -> transfer to network


          Settlement MTM should return a transfer for the network -> unit tested

74048d0

ze97286 reviewed

View reviewed changes

settlement/engine.go Outdated Show resolved Hide resolved

ze97286 reviewed

View reviewed changes

collateral/engine.go Show resolved Hide resolved

peterbarrow added 2 commits

July 7, 2021 13:37


          Fixed loss socialization bug

343094e


          Removed duplicate code

9ca3e17

peterbarrow marked this pull request as ready for review

July 7, 2021 15:05


          Merge branch 'develop' into 3630-settlement-fixes-network-orders

abf5a6b

jeremyletang reviewed

View reviewed changes

settlement/engine.go Outdated Show resolved Hide resolved


          Removed dead code

f22da9b

jeremyletang reviewed

View reviewed changes

settlement/engine.go Outdated Show resolved Hide resolved

EVODelavega and others added 2 commits

July 7, 2021 16:45


          Remove redundant else

88d3b98


          Removed wasted else statement

2b4b85e

jeremyletang reviewed

View reviewed changes

settlement/engine.go Outdated Show resolved Hide resolved


          Removed wasted else statement

ead432b

jeremyletang reviewed

View reviewed changes

settlement/engine.go Outdated Show resolved Hide resolved


          Made code more tidy

Co-authored-by: Jeremy Letang <me@jeremyletang.com>

jeremyletang reviewed

View reviewed changes

settlement/engine.go Outdated Show resolved Hide resolved


          Update settlement/engine.go

cd7c190

jeremyletang reviewed

View reviewed changes

collateral/engine.go Outdated Show resolved Hide resolved

jeremyletang reviewed

View reviewed changes

collateral/simple_distributor.go Outdated Show resolved Hide resolved

jeremyletang approved these changes

View reviewed changes

Member

jeremyletang commented Jul 7, 2021

@peterbarrow @EVODelavega just 2 not so important comments there, then we can get that merged.

peterbarrow and others added 3 commits

July 8, 2021 10:40


          Simplify code

1c6657d

Co-authored-by: Jeremy Letang <me@jeremyletang.com>


          Better check for network events

daf5812


          Merge branch '3630-settlement-fixes-network-orders' of github.com:veg…

6ca5b1b

…aprotocol/vega into 3630-settlement-fixes-network-orders

jeremyletang merged commit 3c3c92d into develop

jeremyletang deleted the 3630-settlement-fixes-network-orders branch

July 8, 2021 11:30

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment