Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit 8d4b489

Browse files
cr22rccr22rc
committed
FABJ-398 Version 2.0.0 start
Change-Id: I0f32848e81454558fb3193a7143a1fa2f3c92613 Signed-off-by: rickr <cr22rc@gmail.com>
1 parent 3495c0d commit 8d4b489

File tree

8 files changed

+115
-40
lines changed

8 files changed

+115
-40
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Java SDK for Hyperledger Fabric 1.4
1+
# Java SDK for Hyperledger Fabric 2.0
22
Welcome to Java SDK for Hyperledger project. The SDK helps facilitate Java applications to manage the lifecycle of
33
Hyperledger channels and user chaincode. The SDK also provides a means to execute
44
user chaincode, query blocks

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>org.hyperledger.fabric-sdk-java</groupId>
55
<artifactId>fabric-sdk-java</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.4.0</version>
7+
<version>2.0.0-SNAPSHOT</version>
88
<name>fabric-java-sdk</name>
99
<description>Java SDK for Hyperledger fabric project</description>
1010
<url>https://www.hyperledger.org/community/projects</url>

‎src/test/cirun.sh‎

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,52 @@ export ORG_HYPERLEDGER_FABRIC_SDKTEST_PROPOSALWAITTIME=300000
3434
export ORG_HYPERLEDGER_FABRIC_SDKTEST_RUNIDEMIXMTTEST=true
3535

3636
ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION=${ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION:-}
37+
ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION=${ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION:-}
3738

38-
if [ "$ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION" == "1.0.0" ]; then
39-
# Limit the test run for V1.0
40-
export ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CLIENT_AUTH_REQUIRED=false
41-
#Options starting fabric-ca in docker-compose.yaml which are not supported on v1.0
42-
export V11_IDENTITIES_ALLOWREMOVE=""
43-
export V11_AFFILIATIONS_ALLOWREMOVE=""
44-
#set which images we pull for docker-compose.yaml when starting Fabric.
45-
export IMAGE_TAG_FABRIC=:x86_64-1.0.0
46-
export IMAGE_TAG_FABRIC_CA=:x86_64-1.0.0
47-
# set which Fabric generated configuations is used.
48-
export FAB_CONFIG_GEN_VERS="v1.0"
39+
if [ -z $ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION ];then
40+
dotcount="${ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION//\.}"
41+
if [ "3" == "${#dotcount}" ];then
42+
export ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION=${ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION%.*}
4943
else
50-
export ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION="1.4.0"
44+
export ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION=$ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION
45+
fi
46+
fi
5147

52-
# cleans out an existing imgages...
48+
case "$ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION" in
49+
"1.0")
50+
export ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CLIENT_AUTH_REQUIRED=false
51+
#Options starting fabric-ca in docker-compose.yaml which are not supported on v1.0
52+
export V11_IDENTITIES_ALLOWREMOVE=""
53+
export V11_AFFILIATIONS_ALLOWREMOVE=""
54+
#set which images we pull for docker-compose.yaml when starting Fabric.
55+
export IMAGE_TAG_FABRIC=:x86_64-1.0.6
56+
export IMAGE_TAG_FABRIC_CA=:x86_64-1.0.6
57+
# set which Fabric generated configuations is used.
58+
export FAB_CONFIG_GEN_VERS="v1.0"
59+
;;
60+
"1.1" )
61+
export IMAGE_TAG_FABRIC=:x86_64-1.1.1
62+
export IMAGE_TAG_FABRIC_CA=:x86_64-1.1.1
63+
export FAB_CONFIG_GEN_VERS="v1.1"
64+
;;
65+
"1.2" )
66+
export IMAGE_TAG_FABRIC=:1.2.1
67+
export IMAGE_TAG_FABRIC_CA=:1.2.1
68+
export FAB_CONFIG_GEN_VERS="v1.2"
69+
;;
70+
"1.3" )
71+
export IMAGE_TAG_FABRIC=:1.3.0
72+
export IMAGE_TAG_FABRIC_CA=:1.3.0
73+
export FAB_CONFIG_GEN_VERS="v1.3"
74+
;;
75+
"1.4" )
76+
export IMAGE_TAG_FABRIC=:1.4
77+
export IMAGE_TAG_FABRIC_CA=:1.4
78+
export FAB_CONFIG_GEN_VERS="v1.3" # not a copy/paste error :)
79+
;;
80+
*)
81+
#export FAB_CONFIG_GEN_VERS="v1.3"
82+
# cleans out an existing imgages...
5383
#(docker images -qa | sort | uniq | xargs docker rmi -f) || true
5484
#(docker images -qa | sort | uniq | xargs docker rmi -f) || true
5585
#(docker images -qa | sort | uniq | xargs docker rmi -f) || true
@@ -58,10 +88,12 @@ export ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION="1.4.0"
5888
#unset to use what's in docker's .env file.
5989
unset IMAGE_TAG_FABRIC
6090
unset IMAGE_TAG_FABRIC_CA
61-
fi
91+
;;
92+
esac
93+
6294

6395
echo "environment:--------------------"
64-
env
96+
env | sort
6597
echo "---------------------------------"
6698
echo "java version:--------------------"
6799
java -XshowSettings:properties -version

‎src/test/fabric_test_commitlevel.sh‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,33 @@
1010
export FABRIC_COMMIT=latest
1111
export FABRIC_CA_COMMIT=latest
1212
# if below are set then fabric/ca won't be built.
13+
#export FABRIC_NO_BUILD=true
14+
#export FABRIC_CA_NO_BUILD=true
15+
16+
ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION=${ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION:-}
17+
if [ -z $ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION ];then
18+
export ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION="2.0.0"
19+
fi
20+
21+
22+
dotcount="${ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION//\.}"
23+
if [ "3" == "${#dotcount}" ];then
24+
export ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION=${ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION%.*}
25+
else
26+
export ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION=$ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION
27+
fi
28+
29+
echo "ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION: $ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION"
30+
31+
32+
case "$ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION" in
33+
"2.0")
34+
unset FABRIC_NO_BUILD
35+
unset FABRIC_CA_NO_BUILD
36+
;;
37+
*)
38+
echo "NOT DOING BUILD ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION=$ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION"
1339
export FABRIC_NO_BUILD=true
1440
export FABRIC_CA_NO_BUILD=true
41+
;;
42+
esac

‎src/test/fixture/sdkintegration/.env‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CLIENT_AUTH_REQUIRED=false
4242

4343
##V 1.4
4444
# yes we reuse 1.3 since no change in fabric.
45-
FAB_CONFIG_GEN_VERS=v1.3
46-
V11_IDENTITIES_ALLOWREMOVE=--cfg.identities.allowremove
47-
V11_AFFILIATIONS_ALLOWREMOVE=--cfg.affiliations.allowremove
48-
IMAGE_TAG_FABRIC=:1.4
49-
IMAGE_TAG_FABRIC_CA=:1.4
50-
51-
# Latest
5245
#FAB_CONFIG_GEN_VERS=v1.3
5346
#V11_IDENTITIES_ALLOWREMOVE=--cfg.identities.allowremove
5447
#V11_AFFILIATIONS_ALLOWREMOVE=--cfg.affiliations.allowremove
55-
#IMAGE_TAG_FABRIC=
56-
#IMAGE_TAG_FABRIC_CA=
48+
#IMAGE_TAG_FABRIC=:1.4
49+
#IMAGE_TAG_FABRIC_CA=:1.4
50+
51+
# Latest
52+
FAB_CONFIG_GEN_VERS=v1.3
53+
V11_IDENTITIES_ALLOWREMOVE=--cfg.identities.allowremove
54+
V11_AFFILIATIONS_ALLOWREMOVE=--cfg.affiliations.allowremove
55+
IMAGE_TAG_FABRIC=
56+
IMAGE_TAG_FABRIC_CA=

‎src/test/fixture/sdkintegration/docker-compose.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
- FABRIC_CA_SERVER_REGISTRY_MAXENROLLMENTS=-1
1919
ports:
2020
- "7054:7054"
21-
command: bash -c 'cp -R /tmp/msp /etc/hyperledger/fabric-ca-server; mv /etc/hyperledger/fabric-ca-server/msp/*PublicKey /etc/hyperledger/fabric-ca-server; fabric-ca-server start -b admin:adminpw ${V11_IDENTITIES_ALLOWREMOVE} ${V11_AFFILIATIONS_ALLOWREMOVE} ${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS} -d'
21+
command: sh -c 'mkdir -p /etc/hyperledger/fabric-ca-server;cp -R /tmp/msp /etc/hyperledger/fabric-ca-server; mv /etc/hyperledger/fabric-ca-server/msp/*PublicKey /etc/hyperledger/fabric-ca-server; fabric-ca-server start -b admin:adminpw ${V11_IDENTITIES_ALLOWREMOVE} ${V11_AFFILIATIONS_ALLOWREMOVE} ${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS} -d'
2222

2323
volumes:
2424
- ./e2e-2Orgs/${FAB_CONFIG_GEN_VERS}/crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config:ro
@@ -36,7 +36,7 @@ services:
3636
- FABRIC_CA_SERVER_REGISTRY_MAXENROLLMENTS=-1
3737
ports:
3838
- "8054:7054"
39-
command: bash -c 'cp -R /tmp/msp /etc/hyperledger/fabric-ca-server; mv /etc/hyperledger/fabric-ca-server/msp/*PublicKey /etc/hyperledger/fabric-ca-server; fabric-ca-server start -b admin:adminpw ${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS} -d'
39+
command: sh -c 'mkdir -p /etc/hyperledger/fabric-ca-server;cp -R /tmp/msp /etc/hyperledger/fabric-ca-server; mv /etc/hyperledger/fabric-ca-server/msp/*PublicKey /etc/hyperledger/fabric-ca-server; fabric-ca-server start -b admin:adminpw ${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS} -d'
4040
volumes:
4141
- ./e2e-2Orgs/${FAB_CONFIG_GEN_VERS}/crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config:ro
4242
- ./e2e-2Orgs/${FAB_CONFIG_GEN_VERS}/crypto-config/peerOrganizations/org4.example.com/msp/:/tmp/msp:ro

‎src/test/java/org/hyperledger/fabric/sdk/testutils/TestConfig.java‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,25 @@ public boolean isRunningFabricTLS() {
8585
private final HashMap<String, SampleOrg> sampleOrgs = new HashMap<>();
8686

8787
private static final String ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION
88-
= System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION") == null ? "1.4.0" : System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION");
88+
= System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION") == null ? "2.0.0" : System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION");
8989

9090
int[] fabricVersion = new int[3];
9191

9292
private TestConfig() {
9393

9494
final String[] fvs = ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION.split("\\.");
95-
if (fvs.length != 3) {
96-
throw new AssertionError("Expected environment variable 'ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION' to be three numbers sperated by dots (1.0.0) but got: " + ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION);
95+
if (fvs.length != 3 && fvs.length != 2) {
96+
throw new AssertionError("Expected environment variable 'ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION' to be two or three numbers separated by dots (1.0.0) but got: " + ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION);
9797

9898
}
9999
fabricVersion[0] = Integer.parseInt(fvs[0].trim());
100100
fabricVersion[1] = Integer.parseInt(fvs[1].trim());
101-
fabricVersion[2] = Integer.parseInt(fvs[2].trim());
101+
if (fvs.length == 3) {
102+
fabricVersion[2] = Integer.parseInt(fvs[2].trim());
103+
}
102104

103105
FAB_CONFIG_GEN_VERS = "v" + fabricVersion[0] + "." + fabricVersion[1];
104-
if (FAB_CONFIG_GEN_VERS.equalsIgnoreCase("v1.4")) {
106+
if (FAB_CONFIG_GEN_VERS.equalsIgnoreCase("v1.4") || FAB_CONFIG_GEN_VERS.equalsIgnoreCase("v2.0")) { //TODO REMOVE WHEN WE GET A V2.0 GEN
105107
FAB_CONFIG_GEN_VERS = "v1.3";
106108
}
107109

@@ -228,11 +230,14 @@ public boolean isFabricVersionAtOrAfter(String version) {
228230

229231
final int[] vers = parseVersion(version);
230232
for (int i = 0; i < 3; ++i) {
231-
if (vers[i] > fabricVersion[i]) {
233+
if (vers[i] < fabricVersion[i]) {
234+
return true;
235+
} else if (vers[i] > fabricVersion[i]) {
232236
return false;
237+
233238
}
234239
}
235-
return true;
240+
return vers[2] == fabricVersion[2];
236241
}
237242

238243
public boolean isFabricVersionBefore(String version) {
@@ -508,4 +513,12 @@ private String getDomainName(final String name) {
508513

509514
}
510515

516+
public static void main(String[] ars) {
517+
518+
final TestConfig config = getConfig();
519+
final boolean runningAgainstFabric10 = config.isRunningAgainstFabric10();
520+
521+
System.out.println(runningAgainstFabric10);
522+
}
523+
511524
}

‎src/test/java/org/hyperledger/fabric/sdkintegration/IntegrationSuite.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,23 @@
2020
public class IntegrationSuite {
2121

2222
private static final String ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION
23-
= System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION") == null ? "1.4.0" : System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION");
23+
= System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION") == null ? "2.0.0" : System.getenv("ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION");
2424

2525
static Integer[] fabricVersion = new Integer[3];
2626

2727
static Map<String, List<Class>> runmap = new HashMap<>();
2828

2929
static {
3030
final String[] fvs = ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION.split("\\.");
31-
if (fvs.length != 3) {
32-
throw new AssertionError("Expected environment variable 'ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION' to be three numbers sperated by dots (1.0.0) but got: " + ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION);
31+
if (fvs.length != 3 && fvs.length != 2) {
32+
throw new AssertionError("Expected environment variable 'ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION' to be two or three numbers separated by dots (1.0.0) but got: " + ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION);
3333

3434
}
35-
3635
fabricVersion[0] = Integer.parseInt(fvs[0].trim());
3736
fabricVersion[1] = Integer.parseInt(fvs[1].trim());
38-
fabricVersion[2] = Integer.parseInt(fvs[2].trim());
37+
if (fvs.length == 3) {
38+
fabricVersion[2] = Integer.parseInt(fvs[2].trim());
39+
}
3940

4041
runmap.put("1.0", Arrays.asList(End2endIT.class, End2endAndBackAgainIT.class, HFCAClientIT.class));
4142

@@ -48,6 +49,7 @@ public class IntegrationSuite {
4849
NetworkConfigIT.class, End2endNodeIT.class, End2endJavaIT.class, End2endAndBackAgainNodeIT.class,
4950
End2endIdemixIT.class, PrivateDataIT.class, ServiceDiscoveryIT.class, HFCAClientIT.class));
5051
runmap.put("1.4", runmap.get("1.3"));
52+
runmap.put("2.0", runmap.get("1.3"));
5153

5254
}
5355

0 commit comments

Comments
 (0)