From 4d196fa29e1357b7ce85adb4bc87357915d145a8 Mon Sep 17 00:00:00 2001 From: HAOYUatHZ Date: Tue, 18 Jun 2019 18:01:09 +0800 Subject: [PATCH] clean --- federation/warder.go | 48 +----------------------------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/federation/warder.go b/federation/warder.go index 91da3495..d963b405 100644 --- a/federation/warder.go +++ b/federation/warder.go @@ -221,54 +221,8 @@ func (w *warder) buildSidechainTx(ormTx *orm.CrossTransaction) (*vaporTypes.Tx, return destTx, destTx.ID.String(), nil } -// TODO: func (w *warder) buildMainchainTx(ormTx *orm.CrossTransaction) (*btmTypes.Tx, string, error) { - destTxData := &btmTypes.TxData{Version: 1, TimeRange: 0} - muxID := &btmBc.Hash{} - if err := muxID.UnmarshalText([]byte(ormTx.SourceMuxID)); err != nil { - return nil, "", errors.Wrap(err, "Unmarshal muxID") - } - - for _, req := range ormTx.Reqs { - // getAsset from assetStore instead of preload asset, in order to save db query overload - asset, err := w.assetStore.GetByOrmID(req.AssetID) - if err != nil { - return nil, "", errors.Wrap(err, "get asset by ormAsset ID") - } - - assetID := &btmBc.AssetID{} - if err := assetID.UnmarshalText([]byte(asset.AssetID)); err != nil { - return nil, "", errors.Wrap(err, "Unmarshal muxID") - } - - // rawDefinitionByte, err := hex.DecodeString(asset.RawDefinitionByte) - // if err != nil { - // return nil, "", errors.Wrap(err, "decode rawDefinitionByte") - // } - - // input := vaporTypes.NewCrossChainInput(nil, *muxID, *assetID, req.AssetAmount, req.SourcePos, w.fedProg, rawDefinitionByte) - // destTxData.Inputs = append(destTxData.Inputs, input) - - // controlProgram, err := hex.DecodeString(req.Script) - // if err != nil { - // return nil, "", errors.Wrap(err, "decode req.Script") - // } - - // output := vaporTypes.NewIntraChainOutput(*assetID, req.AssetAmount, controlProgram) - // destTxData.Outputs = append(destTxData.Outputs, output) - } - - destTx := btmTypes.NewTx(*destTxData) - w.addInputWitness(destTx) - - if err := w.db.Where(ormTx).UpdateColumn(&orm.CrossTransaction{ - DestTxHash: sql.NullString{destTx.ID.String(), true}, - }).Error; err != nil { - return nil, "", err - } - - return destTx, destTx.ID.String(), nil - + return nil, "", errors.New("buildMainchainTx not implemented yet") } // tx is a pointer to types.Tx, so the InputArguments can be set and be valid afterward -- 2.11.0