This repository has been archived by the owner on Aug 2, 2021. It is now read-only.
contracts/swap, swap: refactor contractAddress, remove backend as inputParam, function order in contracts/swap #1748
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Eknir
changed the title
mortelli
approved these changes
Sep 12, 2019
zelig
approved these changes
Sep 13, 2019
holisticode
reviewed
Sep 13, 2019
| @@ -130,7 +129,7 @@ func createOwner(prvkey *ecdsa.PrivateKey) *Owner { | |||
|
|
|||
| // DeploySuccess is for convenience log output | |||
| func (s *Swap) DeploySuccess() string { | |||
| return fmt.Sprintf("contract: %s, owner: %s, deposit: %v, signer: %x", s.owner.Contract.Hex(), s.owner.address.Hex(), s.params.InitialDepositAmount, s.owner.publicKey) | |||
| return fmt.Sprintf("contract: %s, owner: %s, deposit: %v, signer: %x", s.GetParams().ContractAddress.Hex(), s.owner.address.Hex(), s.params.InitialDepositAmount, s.owner.publicKey) | |||
There was a problem hiding this comment.
Not related to this PR, but your change reminds me of it: signer: %x........,s.owner.publickey actually prints garbage. Can you open an issue where we'd print the hex value of it? Thanks.
As it is a very small change, you could do it as part of this PR if you want.
holisticode
approved these changes
Sep 13, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR includes a small refactor with regards to where the chequebook contractAddress is stored.
Previously, it was stored explicitly in
swap.owner.Contract, while it was also implicitly stored in swap.contract (otherwise we would not be able to do calls to the contract).This PR removes
swap.owner.Contractas a place to store the contractAddress and exposes the contractAddress viaswap.getParams().Additionally, two other refactors were included:
swapfunctions which haveswapas a receiver (instead, use swap.backend)