Merge branch 'main' into prune-cmd

types/config.go

@@ -34,7 +34,7 @@ var (
 	initConfig sync.Once
 )
 
-// New returns a new Config with default values.
+// NewConfig returns a new Config with default values.
 func NewConfig() *Config {
 	return &Config{
 		sealedch: make(chan struct{}),

types/context.go

@@ -251,7 +251,7 @@ func (c Context) WithIsCheckTx(isCheckTx bool) Context {
 	return c
 }
 
-// WithIsRecheckTx called with true will also set true on checkTx in order to
+// WithIsReCheckTx called with true will also set true on checkTx in order to
 // enforce the invariant that if recheckTx = true then checkTx = true as well.
 func (c Context) WithIsReCheckTx(isRecheckTx bool) Context {
 	if isRecheckTx {

x/upgrade/plan/downloader_test.go

@@ -133,7 +133,7 @@ func requireFileEquals(t *testing.T, path string, tf *TestFile) {
 	require.Equal(t, string(tf.Contents), string(file), "file contents")
 }
 
-// makeFileUrl converts the given path to a URL with the correct checksum query parameter.
+// makeFileURL converts the given path to a URL with the correct checksum query parameter.
 func makeFileURL(t *testing.T, path string) string {
 	t.Helper()
 	f, err := os.Open(path)