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

Commit 8b74992

Browse files
troyrondatroyronda
committed
[FAB-8912] Update stable target to 1.1.0
This change updates: stable target to 1.1.0. prev target to 1.0.6 prerelease target is disabled. 1.0.0 is retired from integration testing. delivery service becomes default (used to be eventhub). Change-Id: I07d4c4193e85f5eaf59de0990be1bca6536ac3e6 Signed-off-by: Troy Ronda <troy@troyronda.com>
1 parent 676d7a1 commit 8b74992

Some content is hidden

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

52 files changed

+388
-383
lines changed

‎CHANGELOG.md‎

Lines changed: 288 additions & 1 deletion
Large diffs are not rendered by default.

‎Makefile‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ DOCKER_CMD ?= docker
2727
DOCKER_COMPOSE_CMD ?= docker-compose
2828

2929
# Fabric versions used in the Makefile
30-
FABRIC_STABLE_VERSION := 1.0.6
31-
FABRIC_STABLE_VERSION_MINOR := 1.0
30+
FABRIC_STABLE_VERSION := 1.1.0
31+
FABRIC_STABLE_VERSION_MINOR := 1.1
3232
FABRIC_STABLE_VERSION_MAJOR := 1
3333
FABRIC_BASEIMAGE_STABLE_VERSION := 0.4.6
3434

3535
FABRIC_PRERELEASE_VERSION := 1.1.0
36-
FABRIC_PREV_VERSION := 1.0.0
36+
FABRIC_PREV_VERSION := 1.0.6
3737
FABRIC_DEVSTABLE_VERSION_MINOR := 1.1
3838
FABRIC_DEVSTABLE_VERSION_MAJOR := 1
3939

@@ -77,11 +77,12 @@ FABRIC_SDK_DEPRECATED_UNITTEST ?= false
7777
INT_TESTS_LOCAL_CONFIG_FILE := config_test_local.yaml
7878

7979
# Code levels to exercise integration/e2e tests against (overridable)
80-
FABRIC_STABLE_INTTEST ?= true
81-
FABRIC_STABLE_PKCS11_INTTEST ?= false
82-
FABRIC_PREV_INTTEST ?= false
83-
FABRIC_PRERELEASE_INTTEST ?= false
84-
FABRIC_DEVSTABLE_INTTEST ?= false
80+
FABRIC_STABLE_INTTEST ?= true
81+
FABRIC_STABLE_PKCS11_INTTEST ?= false
82+
FABRIC_STABLE_REVOKED_INTTEST ?= false
83+
FABRIC_PREV_INTTEST ?= false
84+
FABRIC_PRERELEASE_INTTEST ?= false
85+
FABRIC_DEVSTABLE_INTTEST ?= false
8586

8687
# Code levels
8788
FABRIC_STABLE_CODELEVEL_TAG := stable
@@ -138,8 +139,9 @@ export FABRIC_SDKGO_DEPEND_INSTALL=true
138139
FABRIC_SDK_DEPRECATED_UNITTEST := false
139140
FABRIC_STABLE_INTTEST := true
140141
FABRIC_STABLE_PKCS11_INTTEST := true
142+
FABRIC_STABLE_REVOKED_INTTEST := true
141143
FABRIC_PREV_INTTEST := true
142-
FABRIC_PRERELEASE_INTTEST := true
144+
FABRIC_PRERELEASE_INTTEST := false
143145
FABRIC_DEVSTABLE_INTTEST := false
144146
endif
145147

@@ -221,14 +223,6 @@ unit-tests-pkcs11: checks depend populate
221223
@FABRIC_SDKGO_CODELEVEL=$(FABRIC_CODELEVEL_UNITTEST_TAG) FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_CODELEVEL_UNITTEST_VER) $(TEST_SCRIPTS_PATH)/unit-pkcs11.sh
222224

223225

224-
.PHONY: integration-tests-revoked
225-
integration-tests-revoked: clean depend populate
226-
@cd $(FIXTURE_DOCKERENV_PATH) && \
227-
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY)/ $(DOCKER_COMPOSE_CMD) -f docker-compose.yaml -f docker-compose-revoked.yaml up --force-recreate --abort-on-container-exit
228-
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY)/ $(FIXTURE_SCRIPTS_PATH)/check_status.sh "-f ./docker-compose.yaml -f ./docker-compose-revoked.yaml"
229-
230-
231-
232226
.PHONY: integration-tests-stable
233227
integration-tests-stable: clean depend populate
234228
@cd $(FIXTURE_DOCKERENV_PATH) && \
@@ -257,6 +251,12 @@ integration-tests-devstable: clean depend populate
257251
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_DEVSTABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_DEVSTABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY)/ $(DOCKER_COMPOSE_CMD) -f docker-compose.yaml -f docker-compose-nopkcs11-test.yaml up --force-recreate --abort-on-container-exit
258252
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_DEV_REGISTRY)/ $(FIXTURE_SCRIPTS_PATH)/check_status.sh "-f ./docker-compose.yaml -f ./docker-compose-nopkcs11-test.yaml"
259253

254+
.PHONY: integration-tests-stable-revoked
255+
integration-tests-stable-revoked: clean depend populate
256+
@cd $(FIXTURE_DOCKERENV_PATH) && \
257+
FABRIC_SDKGO_CODELEVEL_VER=$(FABRIC_STABLE_CODELEVEL_VER) FABRIC_SDKGO_CODELEVEL_TAG=$(FABRIC_STABLE_CODELEVEL_TAG) FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY)/ $(DOCKER_COMPOSE_CMD) -f docker-compose.yaml -f docker-compose-revoked.yaml up --force-recreate --abort-on-container-exit
258+
@cd $(FIXTURE_DOCKERENV_PATH) && FABRIC_DOCKER_REGISTRY=$(FABRIC_RELEASE_REGISTRY)/ $(FIXTURE_SCRIPTS_PATH)/check_status.sh "-f ./docker-compose.yaml -f ./docker-compose-revoked.yaml"
259+
260260
.PHONY: integration-tests-stable-pkcs11
261261
integration-tests-stable-pkcs11: clean depend populate build-softhsm2-image
262262
@cd $(FIXTURE_DOCKERENV_PATH) && \
@@ -278,10 +278,6 @@ integration-tests: integration-test
278278

279279
.PHONY: integration-test
280280
integration-test: clean depend populate
281-
ifeq ($(FABRIC_STABLE_INTTEST),true)
282-
@$(MAKE) -f $(MAKEFILE_THIS) clean
283-
@FABRIC_SDKGO_SUBTARGET=true $(MAKE) -f $(MAKEFILE_THIS) integration-tests-revoked
284-
endif
285281
ifeq ($(FABRIC_STABLE_INTTEST),true)
286282
@$(MAKE) -f $(MAKEFILE_THIS) clean
287283
@FABRIC_SDKGO_SUBTARGET=true $(MAKE) -f $(MAKEFILE_THIS) integration-tests-stable
@@ -290,6 +286,10 @@ ifeq ($(FABRIC_STABLE_PKCS11_INTTEST),true)
290286
@$(MAKE) -f $(MAKEFILE_THIS) clean
291287
@FABRIC_SDKGO_SUBTARGET=true $(MAKE) -f $(MAKEFILE_THIS) integration-tests-stable-pkcs11
292288
endif
289+
ifeq ($(FABRIC_STABLE_REVOKED_INTTEST),true)
290+
@$(MAKE) -f $(MAKEFILE_THIS) clean
291+
@FABRIC_SDKGO_SUBTARGET=true $(MAKE) -f $(MAKEFILE_THIS) integration-tests-stable-revoked
292+
endif
293293
ifeq ($(FABRIC_PRERELEASE_INTTEST),true)
294294
@$(MAKE) -f $(MAKEFILE_THIS) clean
295295
@FABRIC_SDKGO_SUBTARGET=true $(MAKE) -f $(MAKEFILE_THIS) integration-tests-prerelease

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ You're good to go, happy coding! Check out the examples for usage demonstrations
4040

4141
### Current Compatibility
4242
The SDK's integration tests run against three tagged Fabric versions:
43-
- prev (currently v1.0.0)
44-
- stable (currently latest of v1.0.x)
45-
- prerelease (currently latest of v1.1.0-x)
43+
- prev (currently v1.0.6)
44+
- stable (currently v1.1.0)
45+
- prerelease (currently disabled)
4646

4747
Additionally for development purposes integration tests also run against the devstable Fabric version as needed.
4848

4949
### Retired versions
5050
When the 'prev' code level is updated, the last tested fabric-sdk-go commit or tag is listed below.
5151

5252
- fabric v1.0.0 & fabric-ca v1.0.0
53-
- fabric-sdk-go: master:HEAD
53+
- fabric-sdk-go: 79b343ba
5454

5555
### Running the test suite
5656

‎pkg/core/config/config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,10 +542,10 @@ func (c *Config) Timeout(tType core.TimeoutType) time.Duration {
542542
func (c *Config) EventServiceType() core.EventServiceType {
543543
etype := c.configViper.GetString("client.eventService.type")
544544
switch etype {
545-
case "deliver":
546-
return core.DeliverEventServiceType
547-
default:
545+
case "eventhub":
548546
return core.EventHubEventServiceType
547+
default:
548+
return core.DeliverEventServiceType
549549
}
550550
}
551551

‎pkg/fab/orderer/orderer.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ func (o *Orderer) SendBroadcast(ctx reqContext.Context, envelope *fab.SignedEnve
288288
func broadcastStream(broadcastClient ab.AtomicBroadcast_BroadcastClient, responses chan common.Status, errs chan error) {
289289

290290
broadcastResponse, err := broadcastClient.Recv()
291-
logger.Debugf("Orderer.broadcastStream - response:%v, error:%v", broadcastResponse, err)
292291
if err != nil {
293292
rpcStatus, ok := grpcstatus.FromError(err)
294293
if ok {

‎test/fixtures/config/config_pkcs11_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ client:
4343
# This interval will define how long a peer is greylisted
4444
greylistExpiry: 5s
4545
eventService:
46-
# Event service type (deliver|eventhub) - default: eventhub
46+
# Event service type (deliver|eventhub) - default: deliver
4747
# NOTE: This is temporary until the SDK starts making use of channel capabilities
48-
type: eventhub
48+
type: deliver
4949
timeout:
5050
connection: 3s
5151
registrationResponse: 10s

‎test/fixtures/config/config_revoke_test.yaml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ client:
4444
# This interval will define how long a peer is greylisted
4545
greylistExpiry: 5s
4646
eventService:
47-
# Event service type (deliver|eventhub) - default: eventhub
47+
# Event service type (deliver|eventhub) - default: deliver
4848
# NOTE: This is temporary until the SDK starts making use of channel capabilities
49-
type: eventhub
49+
type: deliver
5050
timeout:
5151
connection: 3s
5252
registrationResponse: 10s
@@ -274,12 +274,11 @@ peers:
274274
# this URL is used to connect the EventHub and registering event listeners
275275
eventUrl: peer0.org1.example.com:7053
276276

277-
#TODO to be moved to high level, common for all grpc connections
278277
grpcOptions:
279278
ssl-target-name-override: peer0.org1.example.com
280-
# These parameters should be set in coordination with the keepalive policy on the server,
281-
# as incompatible settings can result in closing of connection.
282-
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
279+
# These parameters should be set in coordination with the keepalive policy on the server,
280+
# as incompatible settings can result in closing of connection.
281+
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
283282
keep-alive-time: 0s
284283
keep-alive-timeout: 20s
285284
keep-alive-permit: false
@@ -294,13 +293,13 @@ peers:
294293

295294
local.peer1.org2.example.com:
296295
url: peer1.org2.example.com:9051
297-
eventUrl: peer1.org2.example.com:9053
298-
#TODO to be moved to high level, common for all grpc connections
296+
#eventUrl: peer1.org2.example.com:9053
297+
299298
grpcOptions:
300299
ssl-target-name-override: peer1.org2.example.com
301-
# These parameters should be set in coordination with the keepalive policy on the server,
302-
# as incompatible settings can result in closing of connection.
303-
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
300+
# These parameters should be set in coordination with the keepalive policy on the server,
301+
# as incompatible settings can result in closing of connection.
302+
# When duration of the 'keep-alive-time' is set to 0 or less the keep alive client parameters are disabled
304303
keep-alive-time: 0s
305304
keep-alive-timeout: 20s
306305
keep-alive-permit: false

‎test/fixtures/config/config_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ client:
4444
# This interval will define how long a peer is greylisted
4545
greylistExpiry: 5s
4646
eventService:
47-
# Event service type (deliver|eventhub) - default: eventhub
47+
# Event service type (deliver|eventhub) - default: deliver
4848
# NOTE: This is temporary until the SDK starts making use of channel capabilities
49-
type: eventhub
49+
type: deliver
5050
timeout:
5151
connection: 3s
5252
registrationResponse: 10s

‎test/fixtures/config/config_test_local.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ client:
4646
# This interval will define how long a peer is greylisted
4747
greylistExpiry: 5s
4848
eventService:
49-
# Event service type (deliver|eventhub) - default: eventhub
49+
# Event service type (deliver|eventhub) - default: deliver
5050
# NOTE: This is temporary until the SDK starts making use of channel capabilities
51-
type: eventhub
51+
type: deliver
5252
timeout:
5353
connection: 3s
5454
registrationResponse: 10s

‎test/fixtures/config/config_test_no_orderer.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ client:
4444
# This interval will define how long a peer is greylisted
4545
greylistExpiry: 5s
4646
eventService:
47-
# Event service type (deliver|eventhub) - default: eventhub
47+
# Event service type (deliver|eventhub) - default: deliver
4848
# NOTE: This is temporary until the SDK starts making use of channel capabilities
49-
type: eventhub
49+
type: deliver
5050
timeout:
5151
connection: 3s
5252
registrationResponse: 10s

0 commit comments

Comments
 (0)
⚡