Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[PAN-3009] Fixes invalid JsonGetter, comment #1811

Merged
merged 9 commits into from
Aug 27, 2019
Merged

[PAN-3009] Fixes invalid JsonGetter, comment #1811

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3dc5b45
Fixes invalid JsonGetter, comment
josh-richardson Aug 1, 2019
b7e0096
Merge branch 'master' into pan-3009
josh-richardson Aug 13, 2019
321c613
Update comment
josh-richardson Aug 13, 2019
ba848a2
Merge branch 'master' into pan-3009
MadelineMurray Aug 17, 2019
ee4f73a
Update PrivateTransactionLegacyResult.java
josh-richardson Aug 21, 2019
725efd8
Merge branch 'master' of github.com:PegaSysEng/pantheon into pan-3009
josh-richardson Aug 21, 2019
3e08414
Merge branch 'pan-3009' of github.com:josh-richardson/pantheon into p…
josh-richardson Aug 21, 2019
12d717b
Merge branch 'master' into pan-3009
MadelineMurray Aug 27, 2019
69de649
Merge branch 'master' into pan-3009
MadelineMurray Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...sys/pantheon/ethereum/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
})
/*
The original deserialised private transaction sent via eea_sendRawTransaction
This class is used if the original request was sent with privateFrom and privateFor
This class is used if the original request was sent with privacyGroupId
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be good to update the comment in PrivateTransactionLegacyResult as well (same reason).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has now been addressed. Sorry for the delay.

*/
public class PrivateTransactionGroupResult extends PrivateTransactionResult {
private final String privacyGroupId;
Expand All @@ -46,7 +46,7 @@ public PrivateTransactionGroupResult(final PrivateTransaction tx) {
this.privacyGroupId = BytesValues.asBase64String(tx.getPrivacyGroupId().get());
}

@JsonGetter(value = "privateFor")
@JsonGetter(value = "privacyGroupId")
public String getPrivacyGroupId() {
return privacyGroupId;
}
Expand Down