FAB-12237 Remove use of experimental tag

We no longer muild with experimental features

FAB-12237 #done

Change-Id: I69624617d7f1a504e4ddfac7b0de1763e5e2fbc1
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>

Makefile

@@ -57,15 +57,10 @@ PROJECT_NAME = $(PROJECT_NAME)/fabric
 else
 PROJECT_NAME = hyperledger/fabric
 endif
-EXPERIMENTAL ?= true
 
 BUILD_DIR ?= .build
 NEXUS_REPO = nexus3.hyperledger.org:10001/hyperledger
 
-ifeq ($(EXPERIMENTAL),true)
-GO_TAGS += experimental
-endif
-
 EXTRA_VERSION ?= $(shell git rev-parse --short HEAD)
 PROJECT_VERSION=$(BASE_VERSION)-snapshot-$(EXTRA_VERSION)
 
@@ -81,7 +76,6 @@ METADATA_VAR += BaseVersion=$(BASEIMAGE_RELEASE)
 METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL)
 METADATA_VAR += DockerNamespace=$(DOCKER_NS)
 METADATA_VAR += BaseDockerNamespace=$(BASE_DOCKER_NS)
-METADATA_VAR += Experimental=$(EXPERIMENTAL)
 
 GO_LDFLAGS = $(patsubst %,-X $(PKGNAME)/common/metadata.%,$(METADATA_VAR))
 

common/metadata/metadata.go

@@ -13,4 +13,3 @@ var BaseVersion string = "0.4.12"
 var BaseDockerLabel string = "org.hyperledger.fabric"
 var DockerNamespace string = "hyperledger"
 var BaseDockerNamespace string = "hyperledger"
-var Experimental string = "true"

core/chaincode/platforms/golang/platform.go

@@ -19,7 +19,6 @@ import (
  "sort"
  "strings"
 
- "github.com/hyperledger/fabric/common/metadata"
  "github.com/hyperledger/fabric/core/chaincode/platforms"
  "github.com/hyperledger/fabric/core/chaincode/platforms/ccmetadata"
  "github.com/hyperledger/fabric/core/chaincode/platforms/util"
@@ -508,17 +507,10 @@ func (goPlatform *Platform) GenerateDockerBuild(path string, code []byte, tw *ta
  ldflagsOpt := getLDFlagsOpts()
  logger.Infof("building chaincode with ldflagsOpt: '%s'", ldflagsOpt)
 
- var gotags string
- // check if experimental features are enabled
- if metadata.Experimental == "true" {
- gotags = " experimental"
- }
- logger.Infof("building chaincode with tags: %s", gotags)
-
  codepackage := bytes.NewReader(code)
  binpackage := bytes.NewBuffer(nil)
  err = util.DockerBuild(util.DockerBuildOptions{
- Cmd: fmt.Sprintf("GOPATH=/chaincode/input:$GOPATH go build -tags \"%s\" %s -o /chaincode/output/chaincode %s", gotags, ldflagsOpt, pkgname),
+ Cmd: fmt.Sprintf("GOPATH=/chaincode/input:$GOPATH go build  %s -o /chaincode/output/chaincode %s", ldflagsOpt, pkgname),
  InputStream: codepackage,
  OutputStream: binpackage,
  })

core/scc/loadsysccs_test.go

@@ -64,7 +64,7 @@ func TestLoadSCCPluginInvalid(t *testing.T) {
 var raceEnabled bool
 
 func buildExamplePlugin(t *testing.T, path, pluginPackage string) {
- cmd := exec.Command("go", "build", "-tags", goBuildTags, "-o", path, "-buildmode=plugin")
+ cmd := exec.Command("go", "build", "-o", path, "-buildmode=plugin")
  if raceEnabled {
  cmd.Args = append(cmd.Args, "-race")
  }

orderer/common/metadata/metadata.go

@@ -29,9 +29,12 @@ func GetVersionInfo() string {
  Version = "development build"
  }
 
- return fmt.Sprintf("%s:\n Version: %s\n Commit SHA: %s\n"+
- " Go version: %s\n OS/Arch: %s\n"+
- " Experimental features: %s\n", ProgramName, Version, common.CommitSHA,
+ return fmt.Sprintf(
+ "%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n OS/Arch: %s\n",
+ ProgramName,
+ Version,
+ common.CommitSHA,
  runtime.Version(),
- fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), common.Experimental)
+ fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
+ )
 }

orderer/common/metadata/metadata_test.go

@@ -24,10 +24,12 @@ func TestGetVersionInfo(t *testing.T) {
  common.Version = "testVersion"
  }
 
- expected := fmt.Sprintf("%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n OS/Arch: %s\n"+
- " Experimental features: %s\n", metadata.ProgramName, common.Version,
+ expected := fmt.Sprintf(
+ "%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n OS/Arch: %s\n",
+ metadata.ProgramName, common.Version,
  common.CommitSHA,
- runtime.Version(), fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
- common.Experimental)
+ runtime.Version(),
+ fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
+ )
  assert.Equal(t, expected, metadata.GetVersionInfo())
 }

peer/version/version.go

@@ -52,8 +52,7 @@ func GetInfo() string {
 
  return fmt.Sprintf("%s:\n Version: %s\n Commit SHA: %s\n Go version: %s\n"+
  " OS/Arch: %s\n"+
- " Experimental features: %s\n Chaincode:\n %s\n",
+ " Chaincode:\n %s\n",
  ProgramName, metadata.Version, metadata.CommitSHA, runtime.Version(),
- fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
- metadata.Experimental, ccinfo)
+ fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH), ccinfo)
 }