Wrap up server api

asutula · asutula · commit dbe4bc775331 · 2019-12-27T10:59:55.000-06:00
Signed-off-by: Aaron Sutula &lt;hi@asutula.com&gt;
diff --git a/api/server.go b/api/server.go
@@ -2,15 +2,17 @@ package api
 
 import (
 	"context"
+	"net"
 	"net/http"
 
 	"github.com/ipfs/go-datastore"
+	pb "github.com/textileio/filecoin/api/pb"
 	"github.com/textileio/filecoin/client"
 	"github.com/textileio/filecoin/deals"
 	"google.golang.org/grpc"
 )
 
-// Server represents the configured filecoin grpc server
+// Server represents the configured lotus client and filecoin grpc server
 type Server struct {
 	rpc     *grpc.Server
 	proxy   *http.Server
@@ -22,22 +24,19 @@ type Server struct {
 
 // Config specifies server settings.
 type Config struct {
-	LotusAddress   string
-	LotusAuthToken string
-	// RepoPath  string
-	// Addr      ma.Multiaddr
-	// ProxyAddr ma.Multiaddr
-	// Debug     bool
+	LotusAddress    string
+	LotusAuthToken  string
+	GrpcHostAddress string
 }
 
-// NewServer starts and returns a new server with the given threadservice.
-// The threadservice is *not* managed by the server.
+// NewServer starts and returns a new server with the given configuration.
 func NewServer(ctx context.Context, conf Config) (*Server, error) {
 	c, cls, err := client.New(conf.LotusAddress, conf.LotusAuthToken)
 	if err != nil {
 		panic(err)
 	}
 	defer cls()
+
 	dm := deals.New(c, datastore.NewMapDatastore())
 
 	ctx, cancel := context.WithCancel(ctx)
@@ -48,5 +47,14 @@ func NewServer(ctx context.Context, conf Config) (*Server, error) {
 		cancel:  cancel,
 	}
 
-	return nil, nil
+	listener, err := net.Listen("tcp", conf.GrpcHostAddress)
+	if err != nil {
+		return nil, err
+	}
+	go func() {
+		pb.RegisterAPIServer(s.rpc, s.service)
+		s.rpc.Serve(listener)
+	}()
+
+	return s, nil
 }
diff --git a/api/service.go b/api/service.go
@@ -109,12 +109,11 @@ func (s *service) Store(srv pb.API_StoreServer) error {
 	}
 
 	replyCids := make([]string, len(storeResult.Cids))
-	replyDealConfigs := make([]*pb.DealConfig, len(storeResult.DealConfigs))
-
 	for i, cid := range storeResult.Cids {
 		replyCids[i] = cid.String()
 	}
 
+	replyDealConfigs := make([]*pb.DealConfig, len(storeResult.DealConfigs))
 	for i, dealConfig := range storeResult.DealConfigs {
 		replyDealConfigs[i] = &pb.DealConfig{Miner: dealConfig.Miner, EpochPrice: dealConfig.EpochPrice.Uint64()}
 	}

Original file line number	Diff line number	Diff line change
`@@ -109,12 +109,11 @@ func (s *service) Store(srv pb.API_StoreServer) error {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`replyCids := make([]string, len(storeResult.Cids))`
`112`		`- replyDealConfigs := make([]*pb.DealConfig, len(storeResult.DealConfigs))`
`113`		`-`
`114`	`112`	`for i, cid := range storeResult.Cids {`
`115`	`113`	`replyCids[i] = cid.String()`
`116`	`114`	`}`
`117`	`115`
	`116`	`+ replyDealConfigs := make([]*pb.DealConfig, len(storeResult.DealConfigs))`
`118`	`117`	`for i, dealConfig := range storeResult.DealConfigs {`
`119`	`118`	`replyDealConfigs[i] = &pb.DealConfig{Miner: dealConfig.Miner, EpochPrice: dealConfig.EpochPrice.Uint64()}`
`120`	`119`	`}`