config: split data and config directories by zramsay · Pull Request #709 · tendermint/tendermint

zramsay · 2017-10-04T17:15:42Z

melekes · 2017-10-04T18:26:33Z

cmd/tendermint/commands/testnet.go

 		}
 		// Read priv_validator.json to populate vals
-		privValFile := path.Join(dataDir, mach, "priv_validator.json")
+		privValFile := path.Join(dataDir, mach, cfg.DefaultPrivValPath)


melekes · 2017-10-04T18:27:56Z

cmd/tendermint/commands/testnet.go

 	for i := 0; i < nValidators; i++ {
 		mach := cmn.Fmt("mach%d", i)
-		genDoc.SaveAs(path.Join(dataDir, mach, "genesis.json"))
+		genDoc.SaveAs(path.Join(dataDir, mach, cfg.DefaultGenesisJSONPath))


melekes · 2017-10-04T18:28:35Z

config/config.go

 )

+var (
+	DefaultTendermintDir = ".tendermint"


where is it used?

added to cmd/tendermint/main.go

melekes · 2017-10-04T18:31:05Z

config/config.go

+	DefaultConfigDir     = "config"
+	DefaultDataDir       = "data"
+
+	DefaultConfigFileName  = "config.toml"


I like these, but we already have the config https://github.com/tendermint/tendermint/blob/develop/config/config.go#L69, so we probably use those

i'll tackle that in #705 when diving deeper into the config

Mmm I think Anton is right. Best if we use the values in the config object where we need them rather than these package level globals - it should be part of this PR

Well - I like having all the strings at the top in one place, but I don't think they should be exported.

The only one that should be exported is DefaultTendermintDir

codecov-io · 2017-10-04T18:43:17Z

Codecov Report

Merging #709 into config will increase coverage by 0.36%.
The diff coverage is 68.42%.

@@            Coverage Diff             @@
##           config     #709      +/-   ##
==========================================
+ Coverage   57.37%   57.73%   +0.36%     
==========================================
  Files          82       80       -2     
  Lines        8441     8412      -29     
==========================================
+ Hits         4843     4857      +14     
+ Misses       3176     3129      -47     
- Partials      422      426       +4

ebuchman · 2017-10-05T03:24:59Z

config/config.go

+	DefaultConfigDir     = "config"
+	DefaultDataDir       = "data"
+
+	DefaultConfigFileName  = "config.toml"


Mmm I think Anton is right. Best if we use the values in the config object where we need them rather than these package level globals - it should be part of this PR

ebuchman · 2017-10-05T03:27:18Z

config/config.go

+	DefaultConfigDir     = "config"
+	DefaultDataDir       = "data"
+
+	DefaultConfigFileName  = "config.toml"


Well - I like having all the strings at the top in one place, but I don't think they should be exported.

The only one that should be exported is DefaultTendermintDir

ebuchman · 2017-10-05T03:27:55Z

config/toml.go

@@ -13,9 +12,10 @@ import (

 func EnsureRoot(rootDir string) {
 	cmn.EnsureDir(rootDir, 0700)


do we even need this one if we Ensure subdirs?

zramsay · 2017-10-09T11:54:46Z

addressed all the comments, PTAL

zramsay · 2017-10-26T14:28:40Z

rebased on config, merging to that branch

…nt#709) * crypto/merkle: Add error handling (tendermint#558) * porting pr * Disallow nil root hashes * linting * making computeRootHash private * Update release notes. * Update .changelog/unreleased/breaking-changes/558-tm10011.md Co-authored-by: Thane Thomson <connect@thanethomson.com> * Wrapping the private function into a public one with the old signature. * update comment * remove dependency on amino * Update .changelog/unreleased/breaking-changes/558-tm10011.md Co-authored-by: Thane Thomson <connect@thanethomson.com> --------- Co-authored-by: Thane Thomson <connect@thanethomson.com> (cherry picked from commit d067b74) # Conflicts: # crypto/merkle/proof.go * fix conflict --------- Co-authored-by: Lasaro <lasaro@informal.systems>

zramsay mentioned this pull request Oct 4, 2017

separate config files and data by creating 2 subfolders (config, data) #556

Closed

melekes reviewed Oct 4, 2017

View reviewed changes

ebuchman suggested changes Oct 5, 2017

View reviewed changes

zramsay force-pushed the 556-seperate-configs branch from ad2ff96 to 7914230 Compare October 9, 2017 11:51

zramsay force-pushed the 556-seperate-configs branch from 7914230 to 37a2644 Compare October 9, 2017 11:58

zramsay mentioned this pull request Oct 10, 2017

Fast sync speedup #730

Closed

ebuchman mentioned this pull request Oct 10, 2017

config improvements #628

Closed

5 tasks

zramsay mentioned this pull request Oct 10, 2017

write config.toml with all defaults & improve config doc #733

Merged

zramsay changed the base branch from develop to config October 11, 2017 13:04

zramsay added this to the 0.12.0 milestone Oct 26, 2017

zramsay added 4 commits October 26, 2017 10:21

config; use a seperate config directory, #556

5cfb4aa

config: update docs & parameterize file paths

fdd9f92

config: PR comments

c8e8944

config: use the default object

30dc6fe

zramsay force-pushed the 556-seperate-configs branch from 5013ecd to 6c7fa96 Compare October 26, 2017 14:24

fix a rebase error

98e6f3b

zramsay force-pushed the 556-seperate-configs branch from f9aae8f to 98e6f3b Compare October 26, 2017 14:32

zramsay merged commit 376dfe0 into config Oct 26, 2017

zramsay deleted the 556-seperate-configs branch October 26, 2017 14:33

zramsay mentioned this pull request Oct 26, 2017

Config Improvements #792

Merged

cmwaters pushed a commit to cmwaters/tendermint that referenced this pull request Dec 12, 2022

Remove check rule from makefile. (tendermint#709)

4a4fb27

		@@ -13,9 +12,10 @@ import (

		func EnsureRoot(rootDir string) {
		cmn.EnsureDir(rootDir, 0700)

Conversation

zramsay commented Oct 4, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov-io commented Oct 4, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zramsay commented Oct 9, 2017

Uh oh!

zramsay commented Oct 26, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov-io commented Oct 4, 2017 •

edited

Loading