Use UnmarshalBinary and MarshalBinary for converting to/from Binary form #298
Conversation
This file contains hidden or 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
manoranjith
force-pushed
the
233-use-unmarshal-marshal-binary
branch
2 times, most recently
from
9d1b150 to
f732500
Compare
17 tasks
| @@ -197,15 +195,15 @@ func ToEthState(s *channel.State) adjudicator.ChannelState { | |||
| if len(outcome.Assets) != len(outcome.Balances) || len(s.Balances) != len(outcome.Balances) { | |||
| log.Panic("invalid allocation dimensions") | |||
| } | |||
| appData := new(bytes.Buffer) | |||
| if err := perunio.Encode(appData, s.Data); err != nil { | |||
| appData, err := s.Data.MarshalBinary() | |||
There was a problem hiding this comment.
Since we are in the Ethereum backend here, we could actually handle marshalling in a non-generic way. But I guess for now it is fine like this.
| Wallet: hdWallet, | ||
| AddressInWallet: acc.Address(), | ||
| Backend: new(ethwallet.Backend), | ||
| AddressMarshalled: addrMarshalled, |
There was a problem hiding this comment.
I don't think renaming was actually necessary here, but OK.
There was a problem hiding this comment.
Would be interested to know why do you think so ?
I did a rename here, because Address type has both Encode and MarshalBinary methods defined on it. And we have switched from using Encode to MarshalBinary.
There was a problem hiding this comment.
The Address type does not have an Encode function anymore.
added 4 commits
January 19, 2022 11:56
- Because encoding functions convert data to/from formats that can be send/received over the wire. - But, here, we only want to convert it to binary form. Signed-off-by: Manoranjith <ponraj.manoranjitha@in.bosch.com>
- Because encoding functions convert data to/from formats that can be send/received over the wire. - But, here, we only want to convert it to binary form. - Also, rename the variables in test setup to convey that these are marshalled values and not encoded ones. Signed-off-by: Manoranjith <ponraj.manoranjitha@in.bosch.com>
- For converting data to/from binary form, in order to make a deep copy of it. Signed-off-by: Manoranjith <ponraj.manoranjitha@in.bosch.com>
- Nonce share, by itself is a byte array. - Hence, it can be directly hashed without encoding. Signed-off-by: Manoranjith <ponraj.manoranjitha@in.bosch.com>
manoranjith
force-pushed
the
233-use-unmarshal-marshal-binary
branch
from
f732500 to
5af1ef7
Compare
matthiasgeihs
approved these changes
Jan 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 covers step 4 described in #233.
Note: To be merged after #297.