mod req global to upload

cmd/btfs/daemon.go

@@ -40,7 +40,6 @@ import (
  nodeMount "github.com/TRON-US/go-btfs/fuse/node"
  fsrepo "github.com/TRON-US/go-btfs/repo/fsrepo"
  migrate "github.com/TRON-US/go-btfs/repo/fsrepo/migrations"
- "github.com/TRON-US/go-btfs/settlement/swap/swapprotocol"
  "github.com/TRON-US/go-btfs/spin"
  "github.com/TRON-US/go-btfs/transaction"
  "github.com/TRON-US/go-btfs/transaction/crypto"
@@ -236,8 +235,8 @@ func defaultMux(path string) corehttp.ServeOption {
 }
 
 func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) (_err error) {
- swapprotocol.Req = req
- swapprotocol.Env = env
+ //swapprotocol.Req = req
+ //swapprotocol.Env = env
 
  cctx := env.(*oldcmds.Context)
  _, b := os.LookupEnv(path.BtfsPathKey)

core/commands/cheque/receive_total_count.go

@@ -0,0 +1,37 @@
+package cheque
+
+import (
+ "fmt"
+ "io"
+
+ cmds "github.com/TRON-US/go-btfs-cmds"
+ "github.com/TRON-US/go-btfs/chain"
+)
+
+type ReceiveTotalCountRet struct {
+ Count int `json:"count"`
+}
+
+var ReceiveChequesCountCmd = &cmds.Command{
+ Helptext: cmds.HelpText{
+ Tagline: "send cheque(s) count",
+ },
+
+ Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
+ count, err := chain.SettleObject.ChequebookService.TotalIssuedCount()
+
+ if err != nil {
+ return err
+ }
+
+ return cmds.EmitOnce(res, &ReceiveTotalCountRet{Count: count})
+ },
+ Type: ReceiveTotalCountRet{},
+ Encoders: cmds.EncoderMap{
+ cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, c *ReceiveTotalCountRet) error {
+ fmt.Println("receive cheque(s) count: ", c.Count)
+
+ return nil
+ }),
+ },
+}

core/commands/storage/upload/upload/upload.go

@@ -4,6 +4,7 @@ import (
  "context"
  "errors"
  "fmt"
+ "github.com/TRON-US/go-btfs/settlement/swap/swapprotocol"
  "strconv"
  "strings"
  "time"
@@ -105,6 +106,9 @@ Use status command to check for completion:
  },
  RunTimeout: 15 * time.Minute,
  Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
+ swapprotocol.Req = req
+ swapprotocol.Env = env
+
  ssId := uuid.New().String()
  ctxParams, err := helper.ExtractContextParams(req, env)
  if err != nil {