Skip to content

Commit f8df614

Browse files
committed
Fixed missing cmd/dummy-blockchain, put back support for CLI at top of package
1 parent 6cd1a70 commit f8df614

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ func (f *Flags) GenesisTime() (time.Time, error) {
4242

4343
var cliOpts Flags
4444

45-
func Main() {
45+
func Main(version string) {
4646
root := &cobra.Command{
4747
Use: "dummy-blockchain",
4848
Short: "CLI for the Dummy Chain",
49-
Version: VersionString(),
49+
Version: VersionString(version),
5050
}
5151

5252
root.SetOutput(os.Stderr)

cmd/dummy-blockchain/app/version.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,23 @@ import (
55
"runtime/debug"
66
)
77

8-
var (
9-
Version = "0.0.1"
10-
)
11-
12-
func VersionString() string {
8+
func VersionString(version string) string {
139
gitCommit := "unknown"
1410
gitDate := "unknown"
1511

1612
if info, ok := debug.ReadBuildInfo(); ok {
1713
for _, setting := range info.Settings {
1814
switch setting.Key {
1915
case "vcs.revision":
20-
gitCommit = setting.Value
16+
gitCommit = setting.Value[:7]
2117
case "vcs.time":
2218
gitDate = setting.Value
2319
}
2420
}
2521
}
2622

2723
return fmt.Sprintf(
28-
"%v (Commit=%q Commit Date=%q)",
29-
Version, gitCommit, gitDate,
24+
"%v (Commit: %s, Commit Date: %s)",
25+
version, gitCommit, gitDate,
3026
)
3127
}

cmd/dummy-blockchain/main.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
package main
22

3-
import "github.com/streamingfast/dummy-blockchain/cmd/dummy-blockchain/app"
3+
import (
4+
"github.com/streamingfast/dummy-blockchain/cmd/dummy-blockchain/app"
5+
)
6+
7+
// Injected at build time
8+
var Version string = "<missing>"
49

510
func main() {
6-
app.Main()
11+
app.Main(Version)
712
}

main.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
package main
22

3-
import "github.com/streamingfast/dummy-blockchain/cmd/dummy-blockchain/app"
3+
import (
4+
"github.com/streamingfast/dummy-blockchain/cmd/dummy-blockchain/app"
5+
)
6+
7+
// Injected at build time
8+
var Version string = "<missing>"
49

510
func main() {
6-
app.Main()
11+
app.Main(Version)
712
}

0 commit comments

Comments
 (0)