merge

integration_tests/node_mine_test.go

@@ -200,18 +200,9 @@ func fillEmpty(t *testing.T, l1Client *eth.PollingClient, storageMgr *ethstorage
 	if err != nil {
 		t.Fatalf("Failed to get block number %v", err)
 	}
-<<<<<<< HEAD:integration_tests/node_mine_test.go
 	storageMgr.Reset(int64(block))
-	lastBlobIdx, err := storageMgr.LastKvIndex()
-	if err != nil {
-		t.Fatalf("get lastBlobIdx for FillEmptyKV fail, err: %s", err.Error())
-	}
 	limit := storageMgr.KvEntries() * uint64(len(shardIds))
-=======
-	n.storageManager.Reset(int64(block))
-	lastBlobIdx := n.storageManager.LastKvIndex()
-	limit := n.storageManager.KvEntries() * uint64(len(shardIds))
->>>>>>> 6985e6968ebf0cb626a7764a9f74907a6870feec:ethstorage/node/node_mine_test.go
+	lastBlobIdx := storageMgr.LastKvIndex()
 	for idx := lastBlobIdx; idx < limit; idx++ {
 		err = storageMgr.CommitBlob(idx, empty, common.Hash{})
 		if err != nil {

integration_tests/zk_prover_test.go

@@ -131,13 +131,8 @@ func readXIn(buildDir string) (string, error) {
 		return "", err
 	}
 	defer f.Close()
-<<<<<<< HEAD:integration_tests/zk_prover_test.go
 	var input prover.InputPair
 	var decoder *json.Decoder = json.NewDecoder(f)
-=======
-	var input InputPair
-	var decoder = json.NewDecoder(f)
->>>>>>> 6985e6968ebf0cb626a7764a9f74907a6870feec:ethstorage/prover/zk_prover_test.go
 	err = decoder.Decode(&input)
 	if err != nil {
 		return "", err