OSDN Git Service
(root)
/
bytom
/
vapor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #33 from Bytom/dev_optimize_consensus
[bytom/vapor.git]
/
api
/
query.go
diff --git
a/api/query.go
b/api/query.go
index
c5b0842
..
79ab3a9
100644
(file)
--- a/
api/query.go
+++ b/
api/query.go
@@
-7,7
+7,6
@@
import (
"github.com/vapor/blockchain/txbuilder"
"github.com/vapor/crypto/ed25519"
"github.com/vapor/blockchain/txbuilder"
"github.com/vapor/crypto/ed25519"
- "github.com/vapor/protocol/bc/types/bytom"
log "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
@@
-415,7
+414,7
@@
func (a *API) listPubKeys(ctx context.Context, ins struct {
type GetRawTransationResp struct {
Tx *bytomtypes.Tx `json:"raw_transaction"`
type GetRawTransationResp struct {
Tx *bytomtypes.Tx `json:"raw_transaction"`
- BlockHash b
ytom.Hash
`json:"block_hash"`
+ BlockHash b
c.Hash
`json:"block_hash"`
}
func (a *API) getRawTransaction(ins struct {
}
func (a *API) getRawTransaction(ins struct {
@@
-432,7
+431,6
@@
func (a *API) getRawTransaction(ins struct {
txID := bc.Hash{}
txID.UnmarshalText([]byte(ins.TxID))
txID := bc.Hash{}
txID.UnmarshalText([]byte(ins.TxID))
-
for _, tx := range block.Transactions {
if tx.ID.String() == txID.String() {
rawTransaction = tx
for _, tx := range block.Transactions {
if tx.ID.String() == txID.String() {
rawTransaction = tx