Remove KeyPair dependency from requests and responses #231
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
bartekn
reviewed
Jul 15, 2019
| @@ -42,11 +42,11 @@ public static Asset fromXdr(org.stellar.sdk.xdr.Asset xdr) { | |||
| String assetCode4 = Util.paddedByteArrayToString(xdr.getAlphaNum4().getAssetCode().getAssetCode4()); | |||
| KeyPair issuer4 = KeyPair.fromXdrPublicKey( | |||
| xdr.getAlphaNum4().getIssuer().getAccountID()); | |||
| return new AssetTypeCreditAlphaNum4(assetCode4, issuer4); | |||
| return new AssetTypeCreditAlphaNum4(assetCode4, issuer4.getAccountId()); | |||
There was a problem hiding this comment.
The problem here is that xdr.getAlphaNum4().getIssuer().getAccountID() can be invalid pubket and KeyPair.fromXdrPublicKey will try to create EdDSAPublicKeySpec instance throwing an exception.
| case ASSET_TYPE_CREDIT_ALPHANUM12: | ||
| String assetCode12 = Util.paddedByteArrayToString(xdr.getAlphaNum12().getAssetCode().getAssetCode12()); | ||
| KeyPair issuer12 = KeyPair.fromXdrPublicKey(xdr.getAlphaNum12().getIssuer().getAccountID()); | ||
| return new AssetTypeCreditAlphaNum12(assetCode12, issuer12); | ||
| return new AssetTypeCreditAlphaNum12(assetCode12, issuer12.getAccountId()); |
| @@ -36,7 +36,7 @@ public String getType() { | |||
| assetCode12.setAssetCode12(Util.paddedByteArray(mCode, 12)); | |||
| credit.setAssetCode(assetCode12); | |||
| AccountID accountID = new AccountID(); | |||
| accountID.setAccountID(mIssuer.getXdrPublicKey()); | |||
| accountID.setAccountID(KeyPair.fromAccountId(mIssuer).getXdrPublicKey()); | |||
There was a problem hiding this comment.
This will instantiate EdDSAPublicKeySpec object and throw an exception.
| @@ -36,7 +36,7 @@ public String getType() { | |||
| assetCode4.setAssetCode4(Util.paddedByteArray(mCode, 4)); | |||
| credit.setAssetCode(assetCode4); | |||
| AccountID accountID = new AccountID(); | |||
| accountID.setAccountID(mIssuer.getXdrPublicKey()); | |||
| accountID.setAccountID(KeyPair.fromAccountId(mIssuer).getXdrPublicKey()); | |||
There was a problem hiding this comment.
This will instantiate EdDSAPublicKeySpec object and throw an exception.
| public Page<AccountResponse> execute() throws IOException, TooManyRequestsException { | ||
| return this.execute(this.httpClient, this.buildUri()); | ||
| } | ||
|
|
| @@ -1,7 +1,6 @@ | |||
| package org.stellar.sdk.responses.operations; | |||
|
|
|||
| import com.google.gson.annotations.SerializedName; | |||
|
|
|||
| import org.stellar.sdk.KeyPair; | |||
There was a problem hiding this comment.
Maybe we can remove deprecated getSigner and remove this from imports? EDIT. probably not in a scope of this PR.
| @@ -3,6 +3,7 @@ | |||
| import org.junit.Assert; | |||
| import org.junit.Test; | |||
|
|
|||
| import java.security.Key; | |||
There was a problem hiding this comment.
Probably added by accident.
|
@bartekn could you take another look? I've pushed a commit which fixes the issues you've raised. |
bartekn
approved these changes
Jul 15, 2019
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.
fixes #230
I took this branch #139 , rebased it on top of master and fixed the conflicts