From 5f83294164c07ce55b45f34281367c285c1d5312 Mon Sep 17 00:00:00 2001 From: Marko Baricevic Date: Mon, 1 Jul 2019 11:19:55 +0200 Subject: [PATCH 1/4] Remove debugdb & colors - Newdebugdb is removed from tendermint - colors is removed from tendermint Signed-off-by: Marko Baricevic --- store/rootmulti/store_test.go | 11 ----------- tests/gobash.go | 11 +++++------ 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/store/rootmulti/store_test.go b/store/rootmulti/store_test.go index df2714c6cfe0..24651c236b7a 100644 --- a/store/rootmulti/store_test.go +++ b/store/rootmulti/store_test.go @@ -12,8 +12,6 @@ import ( "github.com/cosmos/cosmos-sdk/store/types" ) -const useDebugDB = false - func TestStoreType(t *testing.T) { db := dbm.NewMemDB() store := NewStore(db) @@ -39,9 +37,6 @@ func TestStoreMount(t *testing.T) { func TestCacheMultiStoreWithVersion(t *testing.T) { var db dbm.DB = dbm.NewMemDB() - if useDebugDB { - db = dbm.NewDebugDB("CMS", db) - } ms := newMultiStoreWithMounts(db) err := ms.LoadLatestVersion() require.Nil(t, err) @@ -79,9 +74,6 @@ func TestCacheMultiStoreWithVersion(t *testing.T) { func TestHashStableWithEmptyCommit(t *testing.T) { var db dbm.DB = dbm.NewMemDB() - if useDebugDB { - db = dbm.NewDebugDB("CMS", db) - } ms := newMultiStoreWithMounts(db) err := ms.LoadLatestVersion() require.Nil(t, err) @@ -106,9 +98,6 @@ func TestHashStableWithEmptyCommit(t *testing.T) { func TestMultistoreCommitLoad(t *testing.T) { var db dbm.DB = dbm.NewMemDB() - if useDebugDB { - db = dbm.NewDebugDB("CMS", db) - } store := newMultiStoreWithMounts(db) err := store.LoadLatestVersion() require.Nil(t, err) diff --git a/tests/gobash.go b/tests/gobash.go index e7bcaa100c82..02a113574237 100644 --- a/tests/gobash.go +++ b/tests/gobash.go @@ -8,14 +8,13 @@ import ( "testing" "github.com/stretchr/testify/require" - cmn "github.com/tendermint/tendermint/libs/common" ) // ExecuteT executes the command, pipes any input to STDIN and return STDOUT, // logging STDOUT/STDERR to t. // nolint: errcheck func ExecuteT(t *testing.T, cmd, input string) (stdout, stderr string) { - t.Log("Running", cmn.Cyan(cmd)) + t.Log("Running", cmd) // split cmd to name and args split := strings.Split(cmd, " ") @@ -43,11 +42,11 @@ func ExecuteT(t *testing.T, cmd, input string) (stdout, stderr string) { proc.Wait() if len(outbz) > 0 { - t.Log("Stdout:", cmn.Green(string(outbz))) + t.Log("Stdout:", string(outbz)) } if len(errbz) > 0 { - t.Log("Stderr:", cmn.Red(string(errbz))) + t.Log("Stderr:", string(errbz)) } stdout = strings.Trim(string(outbz), "\n") @@ -59,7 +58,7 @@ func ExecuteT(t *testing.T, cmd, input string) (stdout, stderr string) { // Execute the command, launch goroutines to log stdout/err to t. // Caller should wait for .Wait() or .Stop() to terminate. func GoExecuteT(t *testing.T, cmd string) (proc *Process) { - t.Log("Running", cmn.Cyan(cmd)) + t.Log("Running", cmd) // Split cmd to name and args. split := strings.Split(cmd, " ") @@ -77,7 +76,7 @@ func GoExecuteT(t *testing.T, cmd string) (proc *Process) { // Same as GoExecuteT but spawns a go routine to ReadAll off stdout. func GoExecuteTWithStdout(t *testing.T, cmd string) (proc *Process) { - t.Log("Running", cmn.Cyan(cmd)) + t.Log("Running", cmd) // Split cmd to name and args. split := strings.Split(cmd, " ") From cb90e0e68e562365d51a1844e975c8df48386f9e Mon Sep 17 00:00:00 2001 From: Marko Baricevic Date: Mon, 1 Jul 2019 11:54:27 +0200 Subject: [PATCH 2/4] add clog --- .pending/improvements/sdk/remove-debugdb-color | 1 + 1 file changed, 1 insertion(+) create mode 100644 .pending/improvements/sdk/remove-debugdb-color diff --git a/.pending/improvements/sdk/remove-debugdb-color b/.pending/improvements/sdk/remove-debugdb-color new file mode 100644 index 000000000000..9dfed6db5465 --- /dev/null +++ b/.pending/improvements/sdk/remove-debugdb-color @@ -0,0 +1 @@ +remove debugdb & colors \ No newline at end of file From b56b612ac14dbe973de838078c1145a1222c6844 Mon Sep 17 00:00:00 2001 From: Marko Baricevic Date: Mon, 1 Jul 2019 12:01:49 +0200 Subject: [PATCH 3/4] pr number include --- .pending/improvements/sdk/remove-debugdb-color | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pending/improvements/sdk/remove-debugdb-color b/.pending/improvements/sdk/remove-debugdb-color index 9dfed6db5465..9cffee5650d5 100644 --- a/.pending/improvements/sdk/remove-debugdb-color +++ b/.pending/improvements/sdk/remove-debugdb-color @@ -1 +1 @@ -remove debugdb & colors \ No newline at end of file +#4651 Remove debugdb & colors \ No newline at end of file From c480314092976fbe2273613b71fc75a294d6886b Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Mon, 1 Jul 2019 09:42:33 -0400 Subject: [PATCH 4/4] Delete remove-debugdb-color --- .pending/improvements/sdk/remove-debugdb-color | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .pending/improvements/sdk/remove-debugdb-color diff --git a/.pending/improvements/sdk/remove-debugdb-color b/.pending/improvements/sdk/remove-debugdb-color deleted file mode 100644 index 9cffee5650d5..000000000000 --- a/.pending/improvements/sdk/remove-debugdb-color +++ /dev/null @@ -1 +0,0 @@ -#4651 Remove debugdb & colors \ No newline at end of file