Skip to content

Commit 605bebe

Browse files
mbwhitembwhite
committed
[FAB-13753] Contract Support
Change-Id: Ia15fd8c6f92979a5dcc8c18180aa1f099af9b796 Signed-off-by: Matthew B. White <[email protected]>
1 parent 1c688a3 commit 605bebe

File tree

82 files changed

+5471
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+5471
-159
lines changed

‎MAINTAINERS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Maintainers
77
| Gari Singh | mastersingh24 | mastersingh24 | garisingh | [email protected] |
88
| Artem Barger | c0rwin | c0rwin | c0rwin | [email protected] |
99
| Gennady Laventman | gennadyl | gennadylaventman | gennadyl | [email protected] |
10+
| Matthew B White | mbwhite | mbwhite | mbwhite | [email protected] |
1011

1112

1213
Retired Maintainers

‎build.gradle‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ allprojects {
1212
mavenLocal()
1313
jcenter()
1414
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
15+
maven { url 'https://jitpack.io' }
16+
mavenCentral()
1517
}
1618
}
1719

@@ -34,5 +36,9 @@ subprojects {
3436
testCompile 'org.mockito:mockito-core:2.23.0'
3537
testCompile 'com.github.stefanbirkner:system-rules:1.17.0'
3638
}
37-
}
3839

40+
41+
tasks.withType(JavaCompile) {
42+
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
43+
}
44+
}

‎fabric-chaincode-docker/build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
buildscript {
88
repositories {
9+
mavenLocal()
910
jcenter()
11+
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
12+
maven { url 'https://jitpack.io' }
1013
mavenCentral()
1114
}
1215
dependencies {

‎fabric-chaincode-docker/build.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,18 @@ fi
7373
if [ -f "/chaincode/input/src/build.gradle" ]
7474
then
7575
buildGradle /chaincode/input/src/ /chaincode/output/
76-
else
76+
elif [ -f "/chaincode/input/build.gradle" ]
77+
then
78+
buildGradle /chaincode/input/ /chaincode/output/
79+
elif [ -f "/chaincode/input/src/pom.xml" ]
80+
then
7781
buildMaven /chaincode/input/src/ /chaincode/output/
82+
elif [ -f "/chaincode/input/pom.xml" ]
83+
then
84+
buildMaven /chaincode/input/ /chaincode/output/
85+
else
86+
>&2 echo "Not build.gralde nor pom.xml found in chaincode source, don't know how to build chaincode"
87+
>&2 echo "Project folder content:"
88+
>&2 find /chaincode/input/src/ -name "*" -exec ls -ld '{}' \;
89+
exit 255
7890
fi

‎fabric-chaincode-example-gradle/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ sourceCompatibility = 1.8
1111
repositories {
1212
mavenLocal()
1313
mavenCentral()
14+
maven { url 'https://jitpack.io' }
1415
}
1516

1617
dependencies {

‎fabric-chaincode-example-maven/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
<junit.version>4.11</junit.version>
2323

2424
</properties>
25+
26+
<repositories>
27+
<repository>
28+
<id>jitpack.io</id>
29+
<url>https://jitpack.io</url>
30+
</repository>
31+
</repositories>
2532

2633
<dependencies>
2734

‎fabric-chaincode-integration-test/bin/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/test/

‎fabric-chaincode-protos/bin/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/main/

‎fabric-chaincode-shim/bin/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/main/
2+
/test/

‎fabric-chaincode-shim/build.gradle‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,20 @@ plugins {
1111
id 'signing'
1212
}
1313

14+
tasks.withType(org.gradle.api.tasks.testing.Test) {
15+
systemProperty 'CORE_CHAINCODE_LOGGING_LEVEL', 'DEBUG'
16+
}
17+
18+
1419
dependencies {
1520
compile project(':fabric-chaincode-protos')
1621
compile 'io.netty:netty-tcnative-boringssl-static:2.0.7.Final'
1722
compile 'org.bouncycastle:bcpkix-jdk15on:1.59'
1823
compile 'org.bouncycastle:bcprov-jdk15on:1.59'
24+
compile 'org.reflections:reflections:0.9.11'
25+
implementation 'com.github.everit-org.json-schema:org.everit.json.schema:1.11.1'
26+
compile 'io.swagger.core.v3:swagger-annotations:2.0.0'
27+
implementation group: 'org.json', name: 'json', version: '20180813'
1928
}
2029

2130
sourceSets {
@@ -62,7 +71,13 @@ jacocoTestCoverageVerification {
6271
element = 'CLASS'
6372
excludes = ['org.hyperledger.fabric.shim.helper.Channel',
6473
'org.hyperledger.fabric.shim.impl.Handler',
65-
'org.hyperledger.fabric.shim.impl.ChaincodeSupportStream.1']
74+
'org.hyperledger.fabric.shim.impl.ChaincodeSupportStream.1',
75+
'org.hyperledger.fabric.contract.ContractRouter',
76+
'org.hyperledger.fabric.contract.routing.impl.ContractDefinitionImpl',
77+
'org.hyperledger.fabric.contract.routing.RoutingRegistry',
78+
'org.hyperledger.fabric.contract.execution.impl.ContractInvocationRequest',
79+
'org.hyperledger.fabric.contract.routing.TransactionType',
80+
'org.hyperledger.fabric.contract.metadata.MetadataBuilder']
6681
limit {
6782
minimum = 0.86
6883
}
@@ -71,9 +86,14 @@ jacocoTestCoverageVerification {
7186
rule {
7287
element = 'CLASS'
7388
includes = ['org.hyperledger.fabric.shim.helper.Channel',
74-
'org.hyperledger.fabric.shim.impl.Handler']
89+
'org.hyperledger.fabric.contract.ContractRouter',
90+
'org.hyperledger.fabric.contract.execution.impl.ContractInvocationRequest',
91+
'org.hyperledger.fabric.contract.routing.impl.ContractDefinitionImpl',
92+
'org.hyperledger.fabric.contract.routing.RoutingRegistry',
93+
'org.hyperledger.fabric.shim.impl.Handler',
94+
'org.hyperledger.fabric.contract.metadata.MetadataBuilder']
7595
limit {
76-
minimum = 0.79
96+
minimum = 0.71
7797
}
7898
}
7999
}
@@ -93,6 +113,7 @@ task licenseCheck {
93113
sourceSet ->
94114
sourceSet.allSource.findAll { !it.path.contains("build") && !it.path.contains("test/resources")}.each {
95115
file ->
116+
if (!file.name.contains("json")){
96117
BufferedReader r = new BufferedReader(new FileReader(file))
97118
def line, hasSPDX = false, hasTraditional = false
98119
while ((line = r.readLine()) != null) {
@@ -112,6 +133,7 @@ task licenseCheck {
112133
missing.add(file)
113134
}
114135
}
136+
}
115137
}
116138
}
117139

@@ -140,7 +162,14 @@ task licenseCheck {
140162

141163
javadoc {
142164
failOnError = false
143-
excludes = ['org/hyperledger/fabric/shim/impl/**',
165+
excludes = ['org/hyperledger/fabric/contract/ContextFactory.java',
166+
'org/hyperledger/fabric/contract/ContractRouter.java',
167+
'org/hyperledger/fabric/contract/ContractRuntimeException.java',
168+
'org/hyperledger/fabric/contract/execution/**',
169+
'org/hyperledger/fabric/contract/metadata/**',
170+
'org/hyperledger/fabric/contract/routing/**',
171+
'org/hyperledger/fabric/contract/systemcontract/**',
172+
'org/hyperledger/fabric/shim/impl/**',
144173
'org/hyperledger/fabric/shim/helper/**',
145174
'org/hyperledger/fabric/shim/ChaincodeBase.java']
146175
source = sourceSets.main.allJava

0 commit comments

Comments
 (0)