From 74b29ed4f3ba0c2e13b8612fd726db92441f7713 Mon Sep 17 00:00:00 2001 From: Dmitry Shulyak Date: Mon, 6 May 2019 19:08:47 +0300 Subject: [PATCH] Export logs content with hexary encoding (#1457) --- exportlogs/logs.go | 6 ++---- exportlogs/logs_test.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/exportlogs/logs.go b/exportlogs/logs.go index 54854aa1d..9144da7a0 100644 --- a/exportlogs/logs.go +++ b/exportlogs/logs.go @@ -3,14 +3,12 @@ package exportlogs import ( "fmt" "io/ioutil" - - "github.com/status-im/go-ethereum/common/hexutil" ) // Log contains actual log content and filename. If content is gzipped Compressed will be set to true. type Log struct { Filename string - Content []byte + Content string Compressed bool } @@ -28,7 +26,7 @@ func ExportFromBaseFile(logFile string) ExportResponse { return ExportResponse{Error: fmt.Errorf("error reading file %s: %v", logFile, err).Error()} } return ExportResponse{Logs: []Log{ - {Filename: logFile, Compressed: false, Content: hexutil.Bytes(data)}, + {Filename: logFile, Compressed: false, Content: string(data)}, }} } diff --git a/exportlogs/logs_test.go b/exportlogs/logs_test.go index 5fbf57823..08dc0dfc7 100644 --- a/exportlogs/logs_test.go +++ b/exportlogs/logs_test.go @@ -21,7 +21,7 @@ func TestExportLogs(t *testing.T) { log := response.Logs[0] require.Equal(t, false, log.Compressed) require.Equal(t, tempf.Name(), log.Filename) - require.Equal(t, logs, string(log.Content)) + require.Equal(t, logs, log.Content) } func TestExportLogsNoFileError(t *testing.T) {