Skip to content

Commit

Permalink
chore: rename the function attribute of Function archive
Browse files Browse the repository at this point in the history 
Signed-off-by: SdgJlbl <[email protected]>
  • Loading branch information
@SdgJlbl
SdgJlbl committed Sep 21, 2023
1 parent e24edd7 commit a0ec8c1
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion chaincode/function/contract_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func TestRegistration(t *testing.T) {
Key: "uuid1",
Name: "Function name",
Description: addressable,
Function: addressable,
Archive: addressable,
Metadata: metadata,
NewPermissions: newPerms,
}
Expand Down
2 changes: 1 addition & 1 deletion e2e/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func (c *TestClient) RegisterFunction(o *FunctionOptions) *asset.Function {
Checksum: "1d55e9c55fa7ad6b6a49ad79da897d58be7ce8b76f92ced4c20f361ba3a0af6e",
StorageAddress: "http://somewhere.local/desc/" + uuid.NewString(),
},
Function: &asset.Addressable{
Archive: &asset.Addressable{
Checksum: "1d55e9c55fa7ad6b6a49ad79da897d58be7ce8b76f92ced4c20f361ba3a0af6e",
StorageAddress: "http://somewhere.local/function/" + uuid.NewString(),
},
Expand Down
4 changes: 2 additions & 2 deletions lib/asset/function.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ message Function {
string key = 1;
string name = 2;
Addressable description = 4;
Addressable function = 5;
Addressable archive = 5;
Permissions permissions = 6;
string owner = 7;
google.protobuf.Timestamp creation_date = 8;
Expand All @@ -63,7 +63,7 @@ message NewFunction {
string key = 1;
string name = 2;
Addressable description = 4;
Addressable function = 5;
Addressable archive = 5;
NewPermissions new_permissions = 6;
map<string, string> metadata = 17;
map<string, FunctionInput> inputs = 18;
Expand Down
2 changes: 1 addition & 1 deletion lib/asset/function_validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func (a *NewFunction) Validate() error {
validation.Field(&a.Key, validation.Required, is.UUID),
validation.Field(&a.Name, nameValidationRules...),
validation.Field(&a.Description, validation.Required),
validation.Field(&a.Function, validation.Required),
validation.Field(&a.Archive, validation.Required),
validation.Field(&a.Metadata, validation.By(validateMetadata)),
validation.Field(&a.NewPermissions, validation.Required),
validation.Field(&a.Inputs, validation.By(validateInputs)),
Expand Down
20 changes: 10 additions & 10 deletions lib/asset/function_validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@ func TestFunctionValidate(t *testing.T) {
"invalidKey": {&NewFunction{
Key: "not36chars",
Name: "invalid key",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
}, false},
"valid": {&NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
}, true},
"invalid_input_kind": {&NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
Inputs: map[string]*FunctionInput{
Expand All @@ -56,7 +56,7 @@ func TestFunctionValidate(t *testing.T) {
"invalid_output_kind": {&NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
Outputs: map[string]*FunctionOutput{
Expand All @@ -66,7 +66,7 @@ func TestFunctionValidate(t *testing.T) {
"invalid_input: data manager + optional": {&NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
Inputs: map[string]*FunctionInput{
Expand All @@ -76,7 +76,7 @@ func TestFunctionValidate(t *testing.T) {
"invalid_input: data manager + multiple": {&NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
Inputs: map[string]*FunctionInput{
Expand All @@ -86,7 +86,7 @@ func TestFunctionValidate(t *testing.T) {
"invalid_output: performance + multiple": {&NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
Outputs: map[string]*FunctionOutput{
Expand All @@ -96,7 +96,7 @@ func TestFunctionValidate(t *testing.T) {
"invalid inputs: multiple data managers": {&NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
Inputs: map[string]*FunctionInput{
Expand All @@ -107,7 +107,7 @@ func TestFunctionValidate(t *testing.T) {
"invalid inputs: data manager without data sample": {&NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
Inputs: map[string]*FunctionInput{
Expand All @@ -117,7 +117,7 @@ func TestFunctionValidate(t *testing.T) {
"invalid inputs: data sample without data manager": {&NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: validAddressable,
Archive: validAddressable,
Description: validAddressable,
NewPermissions: validPerms,
Inputs: map[string]*FunctionInput{
Expand Down
2 changes: 1 addition & 1 deletion lib/service/function.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (s *FunctionService) RegisterFunction(a *asset.NewFunction, owner string) (
Key: a.Key,
Name: a.Name,
Description: a.Description,
Function: a.Function,
Archive: a.Archive,
Metadata: a.Metadata,
Owner: owner,
CreationDate: timestamppb.New(s.GetTimeService().GetTransactionTime()),
Expand Down
4 changes: 2 additions & 2 deletions lib/service/function_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestRegisterFunction(t *testing.T) {
function := &asset.NewFunction{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: functionAddress,
Archive: functionAddress,
Description: description,
NewPermissions: newPerms,
}
Expand All @@ -55,7 +55,7 @@ func TestRegisterFunction(t *testing.T) {
storedFunction := &asset.Function{
Key: "08680966-97ae-4573-8b2d-6c4db2b3c532",
Name: "Test function",
Function: functionAddress,
Archive: functionAddress,
Description: description,
Permissions: perms,
Owner: "owner",
Expand Down
2 changes: 1 addition & 1 deletion server/standalone/dbal/computetask_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestToComputeTask(t *testing.T) {
Key: "function_key",
Name: "function_name",
Description: asset.Addressable{},
Function: asset.Addressable{},
Archive: asset.Addressable{},
Permissions: asset.Permissions{
Download: &asset.Permission{},
Process: &asset.Permission{},
Expand Down
12 changes: 6 additions & 6 deletions server/standalone/dbal/function.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type sqlFunction struct {
Key string
Name string
Description asset.Addressable
Function asset.Addressable
Archive asset.Addressable
Permissions asset.Permissions
Owner string
CreationDate time.Time
Expand All @@ -30,7 +30,7 @@ func (a *sqlFunction) toFunction() *asset.Function {
Key: a.Key,
Name: a.Name,
Description: &a.Description,
Function: &a.Function,
Archive: &a.Archive,
Permissions: &a.Permissions,
Owner: a.Owner,
CreationDate: timestamppb.New(a.CreationDate),
Expand All @@ -46,15 +46,15 @@ func (d *DBAL) AddFunction(function *asset.Function) error {
return err
}

err = d.addAddressable(function.Function)
err = d.addAddressable(function.Archive)
if err != nil {
return err
}

stmt := getStatementBuilder().
Insert("functions").
Columns("key", "channel", "name", "description", "functionAddress", "permissions", "owner", "creation_date", "metadata", "status").
Values(function.Key, d.channel, function.Name, function.Description.StorageAddress, function.Function.StorageAddress, function.Permissions, function.Owner, function.CreationDate.AsTime(), function.Metadata, function.Status.String())
Values(function.Key, d.channel, function.Name, function.Description.StorageAddress, function.Archive.StorageAddress, function.Permissions, function.Owner, function.CreationDate.AsTime(), function.Metadata, function.Status.String())

err = d.exec(stmt)
if err != nil {
Expand Down Expand Up @@ -87,7 +87,7 @@ func (d *DBAL) GetFunction(key string) (*asset.Function, error) {
}

al := sqlFunction{}
err = row.Scan(&al.Key, &al.Name, &al.Description.StorageAddress, &al.Description.Checksum, &al.Function.StorageAddress, &al.Function.Checksum, &al.Permissions, &al.Owner, &al.CreationDate, &al.Metadata, &al.Status)
err = row.Scan(&al.Key, &al.Name, &al.Description.StorageAddress, &al.Description.Checksum, &al.Archive.StorageAddress, &al.Archive.Checksum, &al.Permissions, &al.Owner, &al.CreationDate, &al.Metadata, &al.Status)

if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
Expand Down Expand Up @@ -175,7 +175,7 @@ func (d *DBAL) queryFunctions(p *common.Pagination, filter *asset.FunctionQueryF
for rows.Next() {
al := sqlFunction{}

err = rows.Scan(&al.Key, &al.Name, &al.Description.StorageAddress, &al.Description.Checksum, &al.Function.StorageAddress, &al.Function.Checksum, &al.Permissions, &al.Owner, &al.CreationDate, &al.Metadata, &al.Status)
err = rows.Scan(&al.Key, &al.Name, &al.Description.StorageAddress, &al.Description.Checksum, &al.Archive.StorageAddress, &al.Archive.Checksum, &al.Permissions, &al.Owner, &al.CreationDate, &al.Metadata, &al.Status)
if err != nil {
return nil, "", err
}
Expand Down

0 comments on commit a0ec8c1

Please sign in to comment.