修改冲突

springrain · springrain · commit b68f22892656 · 2021-11-15T16:25:44.000+08:00
diff --git a/kernel/contract/sandbox/cross_query_cache.go b/kernel/contract/sandbox/cross_query_cache.go
@@ -248,9 +248,6 @@ func isEndorsorSignValid(signsValid []*pb.SignatureInfo, queryInfo *pb.CrossQuer
 		//log.Info("Marshal Response failed", "err", err)
 		return false
 	}
-<<<<<<< HEAD
-	cryptoClient, err := crypto_client.CreateCryptoClient(crypto_client.CryptoTypeDefault)
-=======
 
 	//bug(springrain) 需要定义一个参数,用于标示目标链的的加密方式,默认非国密
 	cryptoType := crypto_client.CryptoTypeDefault
@@ -263,7 +260,7 @@ func isEndorsorSignValid(signsValid []*pb.SignatureInfo, queryInfo *pb.CrossQuer
 		}
 	}
 	cryptoClient, err := crypto_client.CreateCryptoClient(cryptoType)
->>>>>>> d35f343 (crypto和默认命名保持一致)
+
 	data := append(reqData[:], resData[:]...)
 	digest := hash.UsingSha256(data)
 	for idx := range signsValid {

Original file line number	Diff line number	Diff line change
`@@ -248,9 +248,6 @@ func isEndorsorSignValid(signsValid []pb.SignatureInfo, queryInfo pb.CrossQuer`
`248`	`248`	`//log.Info("Marshal Response failed", "err", err)`
`249`	`249`	`return false`
`250`	`250`	`}`
`251`		`-<<<<<<< HEAD`
`252`		`- cryptoClient, err := crypto_client.CreateCryptoClient(crypto_client.CryptoTypeDefault)`
`253`		`-=======`
`254`	`251`
`255`	`252`	`//bug(springrain) 需要定义一个参数,用于标示目标链的的加密方式,默认非国密`
`256`	`253`	`cryptoType := crypto_client.CryptoTypeDefault`
`@@ -263,7 +260,7 @@ func isEndorsorSignValid(signsValid []pb.SignatureInfo, queryInfo pb.CrossQuer`
`263`	`260`	`}`
`264`	`261`	`}`
`265`	`262`	`cryptoClient, err := crypto_client.CreateCryptoClient(cryptoType)`
`266`		`->>>>>>> d35f343 (crypto和默认命名保持一致)`
	`263`	`+`
`267`	`264`	`data := append(reqData[:], resData[:]...)`
`268`	`265`	`digest := hash.UsingSha256(data)`
`269`	`266`	`for idx := range signsValid {`