Skip to content
This repository has been archived by the owner on Dec 2, 2021. It is now read-only.

[FABCE-148] Update fabric dep in integration test #29

Conversation

swetharepakula
Copy link
Contributor

  • use fabric release-1.4 branch to pull in fix for nexus repo change
    required to build fabric components

Signed-off-by: Swetha Repakula srepaku@us.ibm.com

  • Ran the basic checks: make basic-checks
  • Ran the unit tests: make unit-test
  • Ran the integration tests: make integration-test
  • Added the associated JIRA ticket number in the commit message title
  • Link to the JIRA Ticket: https://jira.hyperledger.org/browse/FABCE-148

 - use fabric `release-1.4` branch to pull in fix for nexus repo change
 required to build fabric components

Signed-off-by: Swetha Repakula <srepaku@us.ibm.com>
@MHBauer
Copy link
Contributor

MHBauer commented Feb 12, 2020

looking good

else
FABRIC_VERSION=$(git -C ${FABRIC_DIR} describe --abbrev=0)
if [[ ${FABRIC_VERSION} != "v1.4.0" ]]; then
if [[ ${FABRIC_VERSION} != "v1.4.4" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

release-1.4 branch is going to float, can we check for the commit with
git merge-base --is-ancestor 52e51550b0b8f08b2f3c9052e851a82c002d406f HEAD
hyperledger/fabric@52e5155

@@ -22,3 +22,5 @@ replace github.com/go-kit/kit => github.com/go-kit/kit v0.7.0
replace github.com/hyperledger/burrow => github.com/hyperledger/burrow v0.24.4

replace github.com/fsouza/go-dockerclient => github.com/fsouza/go-dockerclient v1.3.0

replace github.com/hyperledger/fabric => github.com/hyperledger/fabric v1.4.4-0.20200211223613-5eaae3a9940d
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't think about updating vendor here, how do you figure this out?

@@ -176,6 +178,8 @@ github.com/spf13/jwalterweatherman
github.com/spf13/pflag
# github.com/spf13/viper v1.4.0
github.com/spf13/viper
# github.com/sykesm/zap-logfmt v0.0.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does the tool automatically make these comments?

@MHBauer
Copy link
Contributor

MHBauer commented Feb 13, 2020

the three failing tests are failing about contacting the orderer, but the one other test that would do that, the e2e test, is not failing.
going to ttry and get some debug info from both the e2e and one of the failing tests and compare.

@MHBauer
Copy link
Contributor

MHBauer commented Feb 13, 2020

e2e doesn't use fab3, so the libs for e2e talking to the orderer are updated with this update, whereas fab3 is not.
Could fab3 need an update like the e2e for the fabric dependencies or fabric-client-go update? Would this break compatibility with 1.4.0?

@MHBauer
Copy link
Contributor

MHBauer commented Feb 13, 2020

some maybe relevant portions from fab3 sdk logs

[o]fab3-Org1-User2]  [fabsdk/fab] 2020/02/13 21:39:11 UTC - chconfig.extractConfig -> DEBU loaded channel config: &{id:testchannel blockNumber:1 msps:[0xc0004300c0 0xc000430540] anchorPeers:[0xc000434540] orderers:[127.0.0.1:7050] versions:0xc0003dd5e0 capabilities:map[:map[V1_4_3:true] Application:map[V1_3:true] Orderer:map[V1_1:true]]}

[o]fab3-Org1-User1]  [fabsdk/fab] 2020/02/13 21:39:11 UTC - channel.orderersFromChannelCfg -> DEBU Failed to get channel Cfg orderer [127.0.0.1:7050] from ordererDict, now trying orderer Matchers in Entity Matchers
[o]fab3-Org1-User1]  [fabsdk/fab] 2020/02/13 21:39:11 UTC - fab.(*EndpointConfig).tryMatchingOrdererConfig -> DEBU Orderer [127.0.0.1:7050] did not match using matcher [(\w+):30000]
[o]fab3-Org1-User1]  [fabsdk/fab] 2020/02/13 21:39:11 UTC - fab.(*EndpointConfig).tryMatchingOrdererConfig -> DEBU Orderer [127.0.0.1:7050] did not match using matcher [(\w+).example.(\w+)]
[o]fab3-Org1-User1]  [fabsdk/fab] 2020/02/13 21:39:11 UTC - channel.orderersFromChannelCfg -> DEBU Found matching ordererConfig from entity Matchers for channel Cfg Orderer [127.0.0.1:7050]

will try to roll back and see what it looks like when it works.

@stale stale bot added the stale label Feb 20, 2020
@stale stale bot closed this Feb 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
2 participants