diff --git a/Makefile b/Makefile index 0366e14072d..450ff9ca6ee 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ # - idemixgen - builds a native idemixgen binary # - integration-test-prereqs - setup prerequisites for integration tests # - integration-test - runs the integration tests -# - ledger - builds a native fabric ledger troubleshooting binary +# - ledgerutil - builds a native ledgerutil binary # - license - checks go source files for Apache license header # - linter - runs all code checks # - native - ensures all native binaries are available @@ -85,14 +85,14 @@ GO_TAGS ?= RELEASE_EXES = orderer $(TOOLS_EXES) RELEASE_IMAGES = baseos ccenv orderer peer tools RELEASE_PLATFORMS = darwin-amd64 linux-amd64 windows-amd64 -TOOLS_EXES = configtxgen configtxlator cryptogen discover idemixgen ledger osnadmin peer +TOOLS_EXES = configtxgen configtxlator cryptogen discover idemixgen ledgerutil osnadmin peer pkgmap.configtxgen := $(PKGNAME)/cmd/configtxgen pkgmap.configtxlator := $(PKGNAME)/cmd/configtxlator pkgmap.cryptogen := $(PKGNAME)/cmd/cryptogen pkgmap.discover := $(PKGNAME)/cmd/discover pkgmap.idemixgen := $(PKGNAME)/cmd/idemixgen -pkgmap.ledger := $(PKGNAME)/cmd/ledger +pkgmap.ledgerutil := $(PKGNAME)/cmd/ledgerutil pkgmap.orderer := $(PKGNAME)/cmd/orderer pkgmap.osnadmin := $(PKGNAME)/cmd/osnadmin pkgmap.peer := $(PKGNAME)/cmd/peer diff --git a/cmd/ledger/main.go b/cmd/ledgerutil/main.go similarity index 88% rename from cmd/ledger/main.go rename to cmd/ledgerutil/main.go index 9fc72878915..2ea27e57dde 100644 --- a/cmd/ledger/main.go +++ b/cmd/ledgerutil/main.go @@ -11,7 +11,7 @@ import ( "os" "path/filepath" - "github.com/hyperledger/fabric/internal/ledger" + "github.com/hyperledger/fabric/internal/ledgerutil" "gopkg.in/alecthomas/kingpin.v2" ) @@ -20,7 +20,7 @@ const ( ) var ( - app = kingpin.New("ledger", "Ledger Utility Tool") + app = kingpin.New("ledgerutil", "Ledger Utility Tool") compare = app.Command("compare", "Compare two ledgers via their snapshots.") snapshotPath1 = compare.Arg("snapshotPath1", "First ledger snapshot directory.").Required().String() @@ -59,7 +59,7 @@ func main() { case compare.FullCommand(): - count, err := ledger.Compare(*snapshotPath1, *snapshotPath2, resultFilepath) + count, err := ledgerutil.Compare(*snapshotPath1, *snapshotPath2, resultFilepath) if err != nil { fmt.Println(err) return diff --git a/cmd/ledger/main_test.go b/cmd/ledgerutil/main_test.go similarity index 89% rename from cmd/ledger/main_test.go rename to cmd/ledgerutil/main_test.go index c19bb3ca60e..b62c1ab4a88 100644 --- a/cmd/ledger/main_test.go +++ b/cmd/ledgerutil/main_test.go @@ -44,13 +44,13 @@ func TestArguments(t *testing.T) { // Build ledger binary gt := gomega.NewWithT(t) - ledger, err := gexec.Build("github.com/hyperledger/fabric/cmd/ledger") + ledgerutil, err := gexec.Build("github.com/hyperledger/fabric/cmd/ledgerutil") gt.Expect(err).NotTo(gomega.HaveOccurred()) defer gexec.CleanupBuildArtifacts() for testName, testCase := range testCases { t.Run(testName, func(t *testing.T) { - cmd := exec.Command(ledger, testCase.args...) + cmd := exec.Command(ledgerutil, testCase.args...) session, err := gexec.Start(cmd, nil, nil) gt.Expect(err).NotTo(gomega.HaveOccurred()) gt.Eventually(session, 5*time.Second).Should(gexec.Exit(testCase.exitCode)) diff --git a/internal/ledger/compare.go b/internal/ledgerutil/compare.go similarity index 99% rename from internal/ledger/compare.go rename to internal/ledgerutil/compare.go index d3fc44f5fdb..6973d3d790c 100644 --- a/internal/ledger/compare.go +++ b/internal/ledgerutil/compare.go @@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -package ledger +package ledgerutil import ( "bufio" diff --git a/internal/ledger/compare_test.go b/internal/ledgerutil/compare_test.go similarity index 99% rename from internal/ledger/compare_test.go rename to internal/ledgerutil/compare_test.go index e742cf548c8..3715ca83843 100644 --- a/internal/ledger/compare_test.go +++ b/internal/ledgerutil/compare_test.go @@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -package ledger +package ledgerutil import ( "bytes"