Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Explicit dependencies in integration test chaincode (release-2.2) #144

Merged
merged 1 commit into from
Aug 18, 2021
Merged

Explicit dependencies in integration test chaincode (release-2.2) #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.20</version>
<version>1.21</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down
1 change: 1 addition & 0 deletions src/test/fixture/sdkintegration/javacc/2.1/sample1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ repositories {

dependencies {
implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.2.+'
implementation 'commons-logging:commons-logging:1.2'
}

shadowJar {
Expand Down
11 changes: 2 additions & 9 deletions ...tion/javacc/2.1/sample1/src/main/java/org/hyperledger/fabric/example/SimpleChaincode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
package org.hyperledger.fabric.example;

import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;

import com.google.protobuf.ByteString;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hyperledger.fabric.shim.ChaincodeBase;
import org.hyperledger.fabric.shim.ChaincodeStub;
import org.hyperledger.fabric.shim.ResponseUtils;

import static java.nio.charset.StandardCharsets.UTF_8;

public class SimpleChaincode extends ChaincodeBase {

private static Log _logger = LogFactory.getLog(SimpleChaincode.class);

@Override
Expand Down Expand Up @@ -112,9 +109,6 @@ private Response move(ChaincodeStub stub, List<String> args) {
}
}
return ResponseUtils.newSuccessResponse();
// return newSuccessResponse("invoke finished successfully", ByteString.copyFrom(accountFromKey + ": " + accountFromValue + " " + accountToKey + ": " + accountToValue, UTF_8).
//
// toByteArray());
}

// Deletes an entity from state
Expand All @@ -140,11 +134,10 @@ private Response query(ChaincodeStub stub, List<String> args) {
return ResponseUtils.newErrorResponse(String.format("Error: state for %s is null", key));
}
_logger.info(String.format("Query Response:\nName: %s, Amount: %s\n", key, val));
return ResponseUtils.newSuccessResponse(val, ByteString.copyFrom(val, UTF_8).toByteArray());
return ResponseUtils.newSuccessResponse(val, val.getBytes(StandardCharsets.UTF_8));
}

public static void main(String[] args) {
new SimpleChaincode().start(args);
}

}