Skip to content

Commit 63c12ff

Browse files
committed
NettyGrpcServerTest -- improve startAndStopTlsPassword, startAndStopTlsWithoutPassword test cases
Signed-off-by: Fedor Tokarev <[email protected]>
1 parent 4f44791 commit 63c12ff

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

fabric-chaincode-shim/src/test/java/org/hyperledger/fabric/shim/NettyGrpcServerTest.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,12 @@ void startAndStopTlsPassword() {
288288
try {
289289
final ChaincodeBase chaincodeBase = new EmptyChaincode();
290290
chaincodeBase.processEnvironmentOptions();
291-
ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, new ChaincodeServerProperties());
291+
final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
292+
chaincodeServerProperties.setTlsEnabled(true);
293+
chaincodeServerProperties.setKeyFile("src/test/resources/client.key.password-protected");
294+
chaincodeServerProperties.setKeyCertChainFile("src/test/resources/client.crt");
295+
chaincodeServerProperties.setKeyPassword("test");
296+
ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
292297
new Thread(() -> {
293298
try {
294299
chaincodeServer.start();
@@ -315,6 +320,9 @@ void startAndStopTlsWithoutPassword() {
315320
final ChaincodeBase chaincodeBase = new EmptyChaincode();
316321
chaincodeBase.processEnvironmentOptions();
317322
final ChaincodeServerProperties chaincodeServerProperties = new ChaincodeServerProperties();
323+
chaincodeServerProperties.setTlsEnabled(true);
324+
chaincodeServerProperties.setKeyFile("src/test/resources/client.key");
325+
chaincodeServerProperties.setKeyCertChainFile("src/test/resources/client.crt");
318326
ChaincodeServer chaincodeServer = new NettyChaincodeServer(chaincodeBase, chaincodeServerProperties);
319327
new Thread(() -> {
320328
try {
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-----BEGIN ENCRYPTED PRIVATE KEY-----
2+
MIGxMBwGCiqGSIb3DQEMAQMwDgQIfzm0IqTm+rACAggABIGQDY1vpaSD+KDuVRyT
3+
Gi35536iOYUuVoz01ktV3YCDv03Pm5+8xZ1JXXW8lDM3JP/TcKbocRRk63y/R7O2
4+
dB9kcyV7/gYtYH0B3TMk1/x1WtfHL8JnYRFHQ/OuhYjJ6O04B4aY2waeYByzsIsI
5+
YhNVZq5fZ7/bjsy8b54o57WD4DDHH3uRysbv8I5TaDVyJMJq
6+
-----END ENCRYPTED PRIVATE KEY-----

0 commit comments

Comments
 (0)