Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 0081879

Browse files
committed
Respond to review
1 parent 75ac569 commit 0081879

File tree

28 files changed

+29
-31
lines changed

28 files changed

+29
-31
lines changed

cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/empty/case3/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/remove/force/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/remove/specific/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/remove/specific/case2/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/remove/unused/case1/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/gps/lock.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ import (
1717
// solution is all that would be necessary to constitute a lock file, though
1818
// tools can include whatever other information they want in their storage.
1919
type Lock interface {
20-
// Indicates the version of the solver used to generate this lock data
21-
//SolverVersion() string
22-
2320
// The hash of inputs to gps that resulted in this lock data
2421
InputHash() []byte
2522

lock.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type rawLock struct {
3636
}
3737

3838
type solveMeta struct {
39-
Memo string `toml:"inputs-hash"`
39+
InputsDigest string `toml:"inputs-digest"`
4040
AnalyzerName string `toml:"analyzer-name"`
4141
AnalyzerVersion int `toml:"analyzer-version"`
4242
SolverName string `toml:"solver-name"`
@@ -74,7 +74,7 @@ func fromRawLock(raw rawLock) (*Lock, error) {
7474
P: make([]gps.LockedProject, len(raw.Projects)),
7575
}
7676

77-
l.SolveMeta.Memo, err = hex.DecodeString(raw.SolveMeta.Memo)
77+
l.SolveMeta.Memo, err = hex.DecodeString(raw.SolveMeta.InputsDigest)
7878
if err != nil {
7979
return nil, errors.Errorf("invalid hash digest in lock's memo field")
8080
}
@@ -121,7 +121,7 @@ func (l *Lock) Projects() []gps.LockedProject {
121121
func (l *Lock) toRaw() rawLock {
122122
raw := rawLock{
123123
SolveMeta: solveMeta{
124-
Memo: hex.EncodeToString(l.SolveMeta.Memo),
124+
InputsDigest: hex.EncodeToString(l.SolveMeta.Memo),
125125
AnalyzerName: l.SolveMeta.AnalyzerName,
126126
AnalyzerVersion: l.SolveMeta.AnalyzerVersion,
127127
SolverName: l.SolveMeta.SolverName,

testdata/lock/error0.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[solve-meta]
2-
inputs-hash = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
2+
inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
33

44
[[projects]]
55
name = "github.com/golang/dep/internal/gps"

testdata/lock/error1.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
packages = ["."]
66

77
[solve-meta]
8-
inputs-hash = "000aaa2a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
8+
inputs-digest = "000aaa2a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
99

testdata/lock/error2.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
packages = ["."]
44

55
[solve-meta]
6-
inputs-hash = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
6+
inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
77

testdata/lock/golden0.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
[solve-meta]
99
analyzer-name = ""
1010
analyzer-version = 0
11-
inputs-hash = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
11+
inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
1212
solver-name = ""
1313
solver-version = 0

testdata/lock/golden1.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
[solve-meta]
99
analyzer-name = ""
1010
analyzer-version = 0
11-
inputs-hash = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
11+
inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
1212
solver-name = ""
1313
solver-version = 0

testdata/txn_writer/expected_diff_output.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
Memo: 595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c -> 2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e
12
Add:
23
[[projects]]
34
name = "github.com/sdboyer/deptest"

testdata/txn_writer/expected_lock.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
[solve-meta]
99
analyzer-name = ""
1010
analyzer-version = 0
11-
inputs-hash = "595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c"
11+
inputs-digest = "595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c"
1212
solver-name = ""
1313
solver-version = 0

testdata/txn_writer/original_lock.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[solve-meta]
2-
inputs-hash = "595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c"
2+
inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
33

44
[[projects]]
55
name = "github.com/foo/bar"

testdata/txn_writer/updated_lock.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[solve-meta]
2-
inputs-hash = "595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c"
2+
inputs-digest = "595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c"
33

44
[[projects]]
55
name = "github.com/foo/bar"

0 commit comments

Comments
 (0)