update

[bytom/vapor.git] / api / receivers.go

diff --git a/api/receivers.go b/api/receivers.go
index 87cab43..730c152 100644 (file)
--- a/api/receivers.go
+++ b/api/receivers.go
@@ -3,15 +3,15 @@ package api
 import (
        "context"
 
-       "github.com/vapor/blockchain/txbuilder"
-       "github.com/vapor/claim/rpc"
-       chainjson "github.com/vapor/encoding/json"
+       "github.com/bytom/vapor/blockchain/txbuilder"
 )
 
-func (a *API) createAccountReceiver(ctx context.Context, ins struct {
+type AccountFilter struct {
        AccountID    string `json:"account_id"`
        AccountAlias string `json:"account_alias"`
-}) Response {
+}
+
+func (a *API) createAccountReceiver(ctx context.Context, ins AccountFilter) Response {
        accountID := ins.AccountID
        if ins.AccountAlias != "" {
                account, err := a.wallet.AccountMgr.FindByAlias(ins.AccountAlias)
@@ -32,40 +32,3 @@ func (a *API) createAccountReceiver(ctx context.Context, ins struct {
                Address:        program.Address,
        })
 }
-
-type fundingResp struct {
-       MainchainAddress string             `json:"mainchain_address"`
-       ControlProgram   chainjson.HexBytes `json:"control_program,omitempty"`
-       ClaimScript      chainjson.HexBytes `json:"claim_script"`
-}
-
-func (a *API) getPeginAddress(ctx context.Context, ins rpc.ClaimArgs) Response {
-
-       pegin := &rpc.BytomPeginRpc{
-               ClaimArgs: ins,
-               Wallet:    a.wallet,
-       }
-
-       resp, err := pegin.GetPeginAddress()
-       if err != nil {
-               return NewErrorResponse(err)
-       }
-
-       return NewSuccessResponse(resp)
-}
-
-func (a *API) getPeginContractAddress(ctx context.Context, ins struct {
-       AccountID    string `json:"account_id"`
-       AccountAlias string `json:"account_alias"`
-}) Response {
-       pegin := &rpc.BytomPeginRpc{
-               ClaimArgs: ins,
-               Wallet:    a.wallet,
-       }
-       resp, err := pegin.GetPeginContractAddress()
-       if err != nil {
-               return NewErrorResponse(err)
-       }
-
-       return NewSuccessResponse(resp)
-}