Skip to content

Commit 98dad22

Browse files
authored
feat(alloc): added name field (#221)
1 parent 1e38524 commit 98dad22

File tree

6 files changed

+30
-7
lines changed

6 files changed

+30
-7
lines changed

cmd/getallocation.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ var getallocationCmd = &cobra.Command{
8282
fmt.Println("allocation:")
8383
fmt.Println(" id: ", alloc.ID)
8484
fmt.Println(" tx: ", alloc.Tx, "(latest create/update allocation transaction hash)")
85+
fmt.Println(" name: ", alloc.Name)
8586
fmt.Println(" data_shards: ", alloc.DataShards)
8687
fmt.Println(" parity_shards: ", alloc.ParityShards)
8788
fmt.Println(" size: ", common.Size(alloc.Size))

cmd/listallocations.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var listallocationsCmd = &cobra.Command{
2828
util.PrintJSON(allocations)
2929
return
3030
}
31-
header := []string{"ID", "Size", "Expiration", "Datashards",
31+
header := []string{"ID", "Name", "Size", "Expiration", "Datashards",
3232
"Parityshards", "Finalized", "Canceled", "R. Price", "W. Price"}
3333
data := make([][]string, len(allocations))
3434
for idx, allocation := range allocations {
@@ -51,7 +51,7 @@ var listallocationsCmd = &cobra.Command{
5151
}
5252

5353
data[idx] = []string{
54-
allocation.ID, size, expStr, d, p,
54+
allocation.ID, allocation.Name, size, expStr, d, p,
5555
strconv.FormatBool(allocation.Finalized),
5656
strconv.FormatBool(allocation.Canceled),
5757
rp.String(), wp.String(),

cmd/newallocation.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,18 @@ var newallocationCmd = &cobra.Command{
170170
log.Fatal("invalid owner value: ", err)
171171
}
172172
}
173+
174+
var allocationName string
175+
if flags.Changed("name") {
176+
allocationName, err = flags.GetString("name")
177+
if err != nil {
178+
log.Fatal("invalid allocation name: ", err)
179+
}
180+
}
181+
173182
var allocationID string
174183
if len(owner) == 0 {
175-
allocationID, err = sdk.CreateAllocation(*datashards, *parityshards,
184+
allocationID, err = sdk.CreateAllocation(allocationName, *datashards, *parityshards,
176185
*size, expireAt, readPrice, writePrice, mcct, lock)
177186
if err != nil {
178187
log.Fatal("Error creating allocation: ", err)
@@ -188,7 +197,7 @@ var newallocationCmd = &cobra.Command{
188197
}
189198
}
190199

191-
allocationID, err = sdk.CreateAllocationForOwner(owner, ownerPublicKey, *datashards, *parityshards,
200+
allocationID, err = sdk.CreateAllocationForOwner(allocationName, owner, ownerPublicKey, *datashards, *parityshards,
192201
*size, expireAt, readPrice, writePrice, mcct, lock, blockchain.GetPreferredBlobbers())
193202
if err != nil {
194203
log.Fatal("Error creating allocation: ", err)
@@ -263,6 +272,8 @@ func init() {
263272
newallocationCmd.Flags().String("owner_public_key", "",
264273
"public key of owner, user when creating an allocation for somone else")
265274

275+
newallocationCmd.Flags().String("name", "", "allocation name")
276+
266277
}
267278

268279
func storeAllocation(allocationID string) {

cmd/updateallocation.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,16 @@ var updateAllocationCmd = &cobra.Command{
8989

9090
setImmutable, _ := cmd.Flags().GetBool("set_immutable")
9191

92+
var allocationName string
93+
if flags.Changed("name") {
94+
allocationName, err = flags.GetString("name")
95+
if err != nil {
96+
log.Fatal("invalid allocation name: ", err)
97+
}
98+
}
99+
92100
txnHash, err := sdk.UpdateAllocation(
101+
allocationName,
93102
size,
94103
int64(expiry/time.Second),
95104
allocID,
@@ -128,4 +137,6 @@ func init() {
128137

129138
updateAllocationCmd.MarkFlagRequired("allocation")
130139

140+
updateAllocationCmd.Flags().String("name", "", "allocation name")
141+
131142
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/0chain/errors v1.0.3
7-
github.com/0chain/gosdk v1.8.2-0.20220423151921-75736d82dc53
7+
github.com/0chain/gosdk v1.8.2-0.20220425031623-55bd6fee2f46
88
github.com/icza/bitio v1.1.0
99
github.com/olekukonko/tablewriter v0.0.5
1010
github.com/spf13/cobra v1.4.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
4242
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
4343
github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
4444
github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
45-
github.com/0chain/gosdk v1.8.2-0.20220423151921-75736d82dc53 h1:xhldNdThQEU1+JPOg65avldOvPEQYeGByNeTvGMFM6I=
46-
github.com/0chain/gosdk v1.8.2-0.20220423151921-75736d82dc53/go.mod h1:Ug0PnuaP1E7FmNrRrZ4/UaC6AveGqU/fDleVFRyFGYg=
45+
github.com/0chain/gosdk v1.8.2-0.20220425031623-55bd6fee2f46 h1:sG8clBv7xgDyLFpzUPy4sjWvRqthxqp/ghNYp801NiA=
46+
github.com/0chain/gosdk v1.8.2-0.20220425031623-55bd6fee2f46/go.mod h1:Ug0PnuaP1E7FmNrRrZ4/UaC6AveGqU/fDleVFRyFGYg=
4747
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
4848
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
4949
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0/go.mod h1:tPaiy8S5bQ+S5sOiDlINkp7+Ef339+Nz5L5XO+cnOHo=

0 commit comments

Comments
 (0)