Merge branch 'main' into feat/include-version-info-to-logs

0xPolygon · May 15, 2024 · 5ee3803 · 5ee3803
2 parents f9a61b2 + d2cf833
commit 5ee3803
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/db/db_test.go b/db/db_test.go
@@ -434,7 +434,7 @@ func Test_DB_GetOffChainData(t *testing.T) {
 				Key:   common.HexToHash("key1"),
 				Value: []byte("value1"),
 			}},
-			key:       common.BytesToHash([]byte("underfined")),
+			key:       common.BytesToHash([]byte("undefined")),
 			returnErr: ErrStateNotSynchronized,
 		},
 	}
@@ -540,7 +540,7 @@ func Test_DB_ListOffChainData(t *testing.T) {
 				Value: []byte("value1"),
 			}},
 			keys: []common.Hash{
-				common.BytesToHash([]byte("underfined")),
+				common.BytesToHash([]byte("undefined")),
 			},
 			sql:       `SELECT key, value FROM data_node\.offchain_data WHERE key IN \(\$1\)`,
 			returnErr: ErrStateNotSynchronized,

diff --git a/docs/running.md b/docs/running.md
@@ -60,7 +60,7 @@ services:
     ports:
       - 5434:5432
     environment:
-      - POSTGRES_USER=committee_user            # CHANGE THIS: use your prefered user name
+      - POSTGRES_USER=committee_user            # CHANGE THIS: use your preferred user name
       - POSTGRES_PASSWORD=committee_password    # CHANGE THIS: use a safe and strong password
       - POSTGRES_DB=committee_db
     command:

diff --git a/log/log.go b/log/log.go
@@ -104,7 +104,7 @@ func WithFields(keyValuePairs ...interface{}) *Logger {
 	l := getDefaultLog().WithFields(keyValuePairs...)
 
 	// since we are returning a new instance, remove one caller from the
-	// stack, because we'll be calling the retruned Logger methods
+	// stack, because we'll be calling the returned Logger methods
 	// directly, not the package functions.
 	x := l.x.WithOptions(zap.AddCallerSkip(-1))
 	l.x = x