engine/engine.go

@@ -83,12 +83,7 @@ func TestEngine(sessionId string) (engine.Engine, func()) {
 	en = en.WithFirst(hl.Init)
 
 	cleanFn := func() {
-		err := en.Finish()
+		err := menuStorageService.Close()
-		if err != nil {
-			logg.Errorf(err.Error())
-		}
-
-		err = menuStorageService.Close()
 		if err != nil {
 			logg.Errorf(err.Error())
 		}

menu_traversal_test.go

@@ -659,14 +659,10 @@ func TestMyAccount_MyAddress(t *testing.T) {
 					t.Errorf("Test case '%s' failed during Flush: %v", group.Name, err)
 				}
 				b := w.Bytes()
+				if !bytes.Equal(b, []byte(step.ExpectedContent)) {
+					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
+				}
 
-				publicKey := extractPublicKey(b)
-
-				expectedContent := bytes.Replace([]byte(step.ExpectedContent), []byte("{public_key}"), []byte(publicKey), -1)
-
-				if !bytes.Equal(b, expectedContent) {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", expectedContent, b)
-				}
 			}
 		}
 	}

test_data.json

@@ -583,7 +583,7 @@
                     },
                     {
                         "input": "6",
-                       "expectedContent": "Address: {public_key}\n9:Quit"
+                       "expectedContent": "Address: 0xdF8CB1D9b5BDaE418E5Bee107031cA7d933906CD\n9:Quit"
                     },
                     {
                         "input": "9",