Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ lint:
golangci-lint run --timeout 2m0s;

integration-tests:
go test ./... -args integration;
sudo go test ./... -args integration;
57 changes: 57 additions & 0 deletions code/go/0chain.net/blobbercore/convert/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/0chain/blobber/code/go/0chain.net/blobbercore/readmarker"
"mime/multipart"
"net/http"
"strings"
"time"

"github.com/0chain/blobber/code/go/0chain.net/blobbercore/allocation"
Expand Down Expand Up @@ -480,3 +481,59 @@ func WriteFileGRPCToHTTP(req *blobbergrpc.UploadFileRequest) (*http.Request, err

return r, nil
}

func DownloadFileGRPCToHTTP(req *blobbergrpc.DownloadFileRequest) (*http.Request, error) {
body := bytes.NewBuffer([]byte{})
writer := multipart.NewWriter(body)

err := writer.WriteField("path", req.Path)
if err != nil {
return nil, err
}

err = writer.WriteField("path_hash", req.PathHash)
if err != nil {
return nil, err
}

err = writer.WriteField("rx_pay", req.RxPay)
if err != nil {
return nil, err
}

err = writer.WriteField("block_num", req.BlockNum)
if err != nil {
return nil, err
}

err = writer.WriteField("num_blocks", req.NumBlocks)
if err != nil {
return nil, err
}

err = writer.WriteField("read_marker", req.ReadMarker)
if err != nil {
return nil, err
}

err = writer.WriteField("auth_token", req.AuthToken)
if err != nil {
return nil, err
}

err = writer.WriteField("content", req.Content)
if err != nil {
return nil, err
}

writer.Close()

r, err := http.NewRequest("POST", "", strings.NewReader(body.String()))
if err != nil {
return nil, err
}

r.Header.Set("Content-Type", writer.FormDataContentType())

return r, nil
}
26 changes: 17 additions & 9 deletions code/go/0chain.net/blobbercore/convert/responseHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package convert
import (
"context"
"encoding/json"

"github.com/0chain/blobber/code/go/0chain.net/core/common"

stats2 "github.com/0chain/blobber/code/go/0chain.net/blobbercore/stats"
Expand Down Expand Up @@ -182,11 +181,12 @@ func CollaboratorResponseCreator(r interface{}) *blobbergrpc.CollaboratorRespons
}

func UpdateObjectAttributesResponseCreator(r interface{}) *blobbergrpc.UpdateObjectAttributesResponse {
if r != nil {
if r == nil {
return nil
}

httpResp, _ := r.(*reference.Attributes)

return &blobbergrpc.UpdateObjectAttributesResponse{WhoPaysForReads: int64(httpResp.WhoPaysForReads)}
}

Expand Down Expand Up @@ -376,14 +376,22 @@ func DownloadFileResponseCreator(r interface{}) *blobbergrpc.DownloadFileRespons
return nil
}

httpResp, _ := r.(*blobberHTTP.DownloadResponse)
return &blobbergrpc.DownloadFileResponse{
Success: httpResp.Success,
Data: httpResp.Data,
AllocationId: httpResp.AllocationID,
Path: httpResp.Path,
LatestRm: ReadMarkerToReadMarkerGRPC(httpResp.LatestRM),
switch httpResp := r.(type) {
case []byte:
return &blobbergrpc.DownloadFileResponse{
Data: httpResp,
}
case *blobberHTTP.DownloadResponse:
return &blobbergrpc.DownloadFileResponse{
Success: httpResp.Success,
Data: httpResp.Data,
AllocationId: httpResp.AllocationID,
Path: httpResp.Path,
LatestRm: ReadMarkerToReadMarkerGRPC(httpResp.LatestRM),
}
}

return nil
}

func UploadFileResponseCreator(r interface{}) *blobbergrpc.UploadFileResponse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,254 @@ VALUES
return nil
}

func (c *TestDataController) AddAttributesTestData(allocationTx, pubkey, clientId string) error {
var err error
var tx *sql.Tx
defer func() {
if err != nil {
if tx != nil {
errRollback := tx.Rollback()
if errRollback != nil {
log.Println(errRollback)
}
}
}
}()

db, err := c.db.DB()
if err != nil {
return err
}

tx, err = db.BeginTx(context.Background(), &sql.TxOptions{})
if err != nil {
return err
}

expTime := time.Now().Add(time.Hour * 100000).UnixNano()

_, err = tx.Exec(`
INSERT INTO allocations (id, tx, owner_id, owner_public_key, expiration_date, payer_id, blobber_size, allocation_root)
VALUES ('exampleId' ,'` + allocationTx + `','` + clientId + `','` + pubkey + `',` + fmt.Sprint(expTime) + `,'examplePayerId', 99999999, '/');
`)
if err != nil {
return err
}

_, err = tx.Exec(`
INSERT INTO allocation_connections (connection_id, allocation_id, client_id, size, status)
VALUES ('connection_id' ,'exampleId','` + clientId + `', 1337, 1);
`)
if err != nil {
return err
}

_, err = tx.Exec(`
INSERT INTO reference_objects (id, allocation_id, path_hash,lookup_hash,type,name,path,hash,custom_meta,content_hash,merkle_root,actual_file_hash,mimetype,write_marker,thumbnail_hash, actual_thumbnail_hash, parent_path)
VALUES
(1234,'exampleId','exampleId:examplePath','exampleId:examplePath','d','root','/','someHash','customMeta','contentHash','merkleRoot','actualFileHash','mimetype','writeMarker','thumbnailHash','actualThumbnailHash','/'),
(123,'exampleId','exampleId:examplePath','exampleId:examplePath','f','some_file','/some_file','someHash','customMeta','contentHash','merkleRoot','actualFileHash','mimetype','writeMarker','thumbnailHash','actualThumbnailHash','/');
`)
if err != nil {
return err
}

err = tx.Commit()
if err != nil {
return err
}

return nil
}

func (c *TestDataController) AddCopyObjectData(allocationTx, pubkey, clientId string) error {
var err error
var tx *sql.Tx
defer func() {
if err != nil {
if tx != nil {
errRollback := tx.Rollback()
if errRollback != nil {
log.Println(errRollback)
}
}
}
}()

db, err := c.db.DB()
if err != nil {
return err
}

tx, err = db.BeginTx(context.Background(), &sql.TxOptions{})
if err != nil {
return err
}

expTime := time.Now().Add(time.Hour * 100000).UnixNano()

_, err = tx.Exec(`
INSERT INTO allocations (id, tx, owner_id, owner_public_key, expiration_date, payer_id, blobber_size, allocation_root)
VALUES ('exampleId' ,'` + allocationTx + `','` + clientId + `','` + pubkey + `',` + fmt.Sprint(expTime) + `,'examplePayerId', 99999999, '/');
`)
if err != nil {
return err
}

_, err = tx.Exec(`
INSERT INTO allocation_connections (connection_id, allocation_id, client_id, size, status)
VALUES ('connection_id' ,'exampleId','` + clientId + `', 1337, 1);
`)
if err != nil {
return err
}

_, err = tx.Exec(`
INSERT INTO reference_objects (id, allocation_id, path_hash,lookup_hash,type,name,path,hash,custom_meta,content_hash,merkle_root,actual_file_hash,mimetype,write_marker,thumbnail_hash, actual_thumbnail_hash, parent_path)
VALUES
(1234,'exampleId','exampleId:examplePath','exampleId:examplePath','d','root','/copy','someHash','customMeta','contentHash','merkleRoot','actualFileHash','mimetype','writeMarker','thumbnailHash','actualThumbnailHash','/'),
(123,'exampleId','exampleId:examplePath','exampleId:examplePath','f','some_file','/some_file','someHash','customMeta','contentHash','merkleRoot','actualFileHash','mimetype','writeMarker','thumbnailHash','actualThumbnailHash','/');
`)
if err != nil {
return err
}

err = tx.Commit()
if err != nil {
return err
}

return nil
}

func (c *TestDataController) AddRenameTestData(allocationTx, pubkey, clientId string) error {
var err error
var tx *sql.Tx
defer func() {
if err != nil {
if tx != nil {
errRollback := tx.Rollback()
if errRollback != nil {
log.Println(errRollback)
}
}
}
}()

db, err := c.db.DB()
if err != nil {
return err
}

tx, err = db.BeginTx(context.Background(), &sql.TxOptions{})
if err != nil {
return err
}

expTime := time.Now().Add(time.Hour * 100000).UnixNano()

_, err = tx.Exec(`
INSERT INTO allocations (id, tx, owner_id, owner_public_key, expiration_date, payer_id, blobber_size, allocation_root)
VALUES ('exampleId' ,'` + allocationTx + `','` + clientId + `','` + pubkey + `',` + fmt.Sprint(expTime) + `,'examplePayerId', 99999999, '/');
`)
if err != nil {
return err
}

_, err = tx.Exec(`
INSERT INTO allocation_connections (connection_id, allocation_id, client_id, size, status)
VALUES ('connection_id' ,'exampleId','` + clientId + `', 1337, 1);
`)
if err != nil {
return err
}

_, err = tx.Exec(`
INSERT INTO reference_objects (id, allocation_id, path_hash,lookup_hash,type,name,path,hash,custom_meta,content_hash,merkle_root,actual_file_hash,mimetype,write_marker,thumbnail_hash, actual_thumbnail_hash, parent_path)
VALUES
(1234,'exampleId','exampleId:examplePath','exampleId:examplePath','d','root','/','someHash','customMeta','contentHash','merkleRoot','actualFileHash','mimetype','writeMarker','thumbnailHash','actualThumbnailHash','/'),
(123,'exampleId','exampleId:examplePath','exampleId:examplePath','f','some_file','/some_file','someHash','customMeta','contentHash','merkleRoot','actualFileHash','mimetype','writeMarker','thumbnailHash','actualThumbnailHash','/');
`)
if err != nil {
return err
}

err = tx.Commit()
if err != nil {
return err
}

return nil
}

func (c *TestDataController) AddDownloadTestData(allocationTx, pubkey, clientId, wmSig string, now common.Timestamp) error {
var err error
var tx *sql.Tx
defer func() {
if err != nil {
if tx != nil {
errRollback := tx.Rollback()
if errRollback != nil {
log.Println(errRollback)
}
}
}
}()

db, err := c.db.DB()
if err != nil {
return err
}

tx, err = db.BeginTx(context.Background(), &sql.TxOptions{})
if err != nil {
return err
}

expTime := time.Now().Add(time.Hour * 100000).UnixNano()

_, err = tx.Exec(`
INSERT INTO allocations (id, tx, owner_id, owner_public_key, expiration_date, payer_id, blobber_size, allocation_root)
VALUES ('exampleId' ,'` + allocationTx + `','` + clientId + `','` + pubkey + `',` + fmt.Sprint(expTime) + `,'examplePayerId', 99999999, '/');
`)
if err != nil {
return err
}

_, err = tx.Exec(`
INSERT INTO allocation_connections (connection_id, allocation_id, client_id, size, status)
VALUES ('connection_id' ,'exampleId','` + clientId + `', 1337, 1);
`)
if err != nil {
return err
}

_, err = tx.Exec(`
INSERT INTO allocation_changes (id, connection_id, operation, size, input)
VALUES (1 ,'connection_id','rename', 1200, '{"allocation_id":"exampleId","path":"/some_file","new_name":"new_name"}');
`)
if err != nil {
return err
}

_, err = tx.Exec(`
INSERT INTO reference_objects (id, allocation_id, path_hash,lookup_hash,type,name,path,hash,custom_meta,content_hash,merkle_root,actual_file_hash,mimetype,write_marker,thumbnail_hash, actual_thumbnail_hash, parent_path)
VALUES
(1234,'exampleId','exampleId:examplePath','exampleId:examplePath','d','root','/','someHash','customMeta','contentHash','merkleRoot','actualFileHash','mimetype','writeMarker','thumbnailHash','actualThumbnailHash','/'),
(123,'exampleId','exampleId:examplePath','exampleId:examplePath','f','some_file','/some_file','someHash','customMeta','tmpMonWenMyFile','merkleRoot','actualFileHash','mimetype','writeMarker','thumbnailHash','actualThumbnailHash','/');
`)
if err != nil {
return err
}

err = tx.Commit()
if err != nil {
return err
}

return nil
}

func (c *TestDataController) AddUploadTestData(allocationTx, pubkey, clientId string) error {
var err error
var tx *sql.Tx
Expand Down
Loading