Skip to content

Commit 703dead

Browse files
committed
[FAB-10212] Fix version info for idemixgen
idemixgen was using the orderer metadata so added a metadata sub package Change-Id: Ibdbff33ac020f62a5d4338030cf6b730430cd5ad Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
1 parent c6d0e6c commit 703dead

File tree

3 files changed

+55
-1
lines changed

3 files changed

+55
-1
lines changed

common/tools/idemixgen/idemixgen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424

2525
"github.com/golang/protobuf/proto"
2626
"github.com/hyperledger/fabric/common/tools/idemixgen/idemixca"
27+
"github.com/hyperledger/fabric/common/tools/idemixgen/metadata"
2728
"github.com/hyperledger/fabric/idemix"
2829
"github.com/hyperledger/fabric/msp"
29-
"github.com/hyperledger/fabric/orderer/common/metadata"
3030
"github.com/pkg/errors"
3131
"gopkg.in/alecthomas/kingpin.v2"
3232
)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package metadata
8+
9+
import (
10+
"fmt"
11+
"runtime"
12+
)
13+
14+
// Package version
15+
var Version string
16+
17+
// Program name
18+
const ProgramName = "idemixgen"
19+
20+
func GetVersionInfo() string {
21+
if Version == "" {
22+
Version = "1.2.0-dev"
23+
}
24+
25+
return fmt.Sprintf("%s:\n Version: %s\n Go version: %s\n OS/Arch: %s",
26+
ProgramName, Version, runtime.Version(),
27+
fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH))
28+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
Copyright IBM Corp. All Rights Reserved.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
package metadata_test
8+
9+
import (
10+
"fmt"
11+
"runtime"
12+
"testing"
13+
14+
"github.com/hyperledger/fabric/common/tools/idemixgen/metadata"
15+
"github.com/stretchr/testify/assert"
16+
)
17+
18+
func TestGetVersionInfo(t *testing.T) {
19+
testVersion := "TestVersion"
20+
metadata.Version = testVersion
21+
22+
expected := fmt.Sprintf("%s:\n Version: %s\n Go version: %s\n OS/Arch: %s",
23+
metadata.ProgramName, testVersion, runtime.Version(),
24+
fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH))
25+
assert.Equal(t, expected, metadata.GetVersionInfo())
26+
}

0 commit comments

Comments
 (0)