| 修订版 | f41e99c65324919ed927a1559d00502b43edfda2 (tree) |
|---|---|
| 时间 | 2019-06-21 12:06:15 |
| 作者 | HAOYUatHZ <haoyu@prot...> |
| Commiter | HAOYUatHZ |
clean
federation/warder.go (diff)| @@ -6,7 +6,6 @@ import ( | ||
| 6 | 6 | "encoding/json" |
| 7 | 7 | "time" |
| 8 | 8 | |
| 9 | - btmBc "github.com/bytom/protocol/bc" | |
| 10 | 9 | btmTypes "github.com/bytom/protocol/bc/types" |
| 11 | 10 | "github.com/jinzhu/gorm" |
| 12 | 11 | log "github.com/sirupsen/logrus" |
| @@ -317,27 +316,13 @@ func (w *warder) getSigns(destTx interface{}, ormTx *orm.CrossTransaction) ([]st | ||
| 317 | 316 | var signs []string |
| 318 | 317 | for _, data := range signData { |
| 319 | 318 | var sign []byte |
| 320 | - switch destTx.(type) { | |
| 321 | - case *vaporTypes.Tx: | |
| 322 | - msg := &vaporBc.Hash{} | |
| 323 | - if err := msg.UnmarshalText([]byte(data)); err != nil { | |
| 324 | - return nil, errors.Wrap(err, "Unmarshal signData") | |
| 325 | - } | |
| 326 | - | |
| 327 | - sign = w.xprv.Sign([]byte(msg.String())) | |
| 328 | - | |
| 329 | - case *btmTypes.Tx: | |
| 330 | - msg := &btmBc.Hash{} | |
| 331 | - if err := msg.UnmarshalText([]byte(data)); err != nil { | |
| 332 | - return nil, errors.Wrap(err, "Unmarshal signData") | |
| 333 | - } | |
| 334 | - | |
| 335 | - sign = w.xprv.Sign([]byte(msg.String())) | |
| 336 | - | |
| 337 | - default: | |
| 338 | - return nil, errUnknownTxType | |
| 319 | + // vaporBc.Hash & btmBc.Hash marshal in the same way | |
| 320 | + msg := &vaporBc.Hash{} | |
| 321 | + if err := msg.UnmarshalText([]byte(data)); err != nil { | |
| 322 | + return nil, errors.Wrap(err, "Unmarshal signData") | |
| 339 | 323 | } |
| 340 | 324 | |
| 325 | + sign = w.xprv.Sign([]byte(msg.String())) | |
| 341 | 326 | signs = append(signs, hex.EncodeToString(sign)) |
| 342 | 327 | } |
| 343 | 328 |
Fork