Merge pull request #3518 from fjl/ethclient-dependency-cleanup

core/types: dependency cleanup
2017-01-06 15:42:03 +02:00
parent e0ee0cc66a d3b751e4d9
commit 8f9daaa3ba
45 changed files with 245 additions and 268 deletions
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@ -963,7 +963,7 @@ func (s *PublicTransactionPoolAPI) GetTransactionReceipt(txHash common.Hash) (ma
 		"logsBloom":         receipt.Bloom,
 	}
 	if receipt.Logs == nil {
-		fields["logs"] = []vm.Logs{}
+		fields["logs"] = [][]*types.Log{}
 	}
 	// If the ContractAddress is 20 0x0 bytes, assume it is not a contract creation
 	if receipt.ContractAddress != (common.Address{}) {