This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[PAN-2672] Return specific and useful error for enclave issues (#1455)
* Return specific error for enclave * Serialize into error object instead of regex to find the error. * Return EnclaveException for errors in Enclave * Fix enclave error response after rebase
- Loading branch information
1 parent
15fb741
commit 3d7a93f
Showing
22 changed files
with
394 additions
and
97 deletions.
There are no files selected for viewing
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
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
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
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
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
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
54 changes: 54 additions & 0 deletions
54
acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/web3j/privacy/PrivacyGroup.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright 2019 ConsenSys AG. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| */ | ||
| package tech.pegasys.pantheon.tests.web3j.privacy; | ||
|
|
||
| import tech.pegasys.pantheon.tests.acceptance.dsl.privacy.PrivacyNet; | ||
| import tech.pegasys.pantheon.util.bytes.BytesValue; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Base64; | ||
| import java.util.Comparator; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.web3j.crypto.Hash; | ||
| import org.web3j.rlp.RlpEncoder; | ||
| import org.web3j.rlp.RlpList; | ||
| import org.web3j.rlp.RlpString; | ||
| import org.web3j.rlp.RlpType; | ||
| import org.web3j.utils.Numeric; | ||
|
|
||
| public class PrivacyGroup { | ||
| public static BytesValue generatePrivacyGroup( | ||
| final PrivacyNet privacyNet, final String sender, final String... receivers) { | ||
| final List<byte[]> stringList = new ArrayList<>(); | ||
| stringList.add( | ||
| Base64.getDecoder().decode(privacyNet.getEnclave(sender).getPublicKeys().get(0))); | ||
| Arrays.stream(receivers) | ||
| .forEach( | ||
| (receiver) -> | ||
| stringList.add( | ||
| Base64.getDecoder() | ||
| .decode(privacyNet.getEnclave(receiver).getPublicKeys().get(0)))); | ||
| List<RlpType> rlpList = | ||
| stringList.stream() | ||
| .distinct() | ||
| .sorted(Comparator.comparing(Arrays::hashCode)) | ||
| .map(RlpString::create) | ||
| .collect(Collectors.toList()); | ||
| return BytesValue.fromHexString( | ||
| Numeric.toHexString( | ||
| Base64.getEncoder().encode(Hash.sha3(RlpEncoder.encode(new RlpList(rlpList)))))); | ||
| } | ||
| } |
Oops, something went wrong.