Skip to content

Commit dc61ee9

Browse files
author
Jayash Satolia
committed
Merge branch 'staging' into sprint-1.19
# Conflicts: # go.mod # go.sum
2 parents d8be6f8 + 24a7e76 commit dc61ee9

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

cmd/newallocation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ var newallocationCmd = &cobra.Command{
284284
}
285285

286286
allocationID, _, _, err = sdk.CreateAllocationForOwner(owner, ownerPublicKey, *datashards, *parityshards,
287-
*size, readPrice, writePrice, lock, preferred_blobbers, blobber_auth_tickets, thirdPartyExtendable, isEnterprise, force, &fileOptionParams, 0)
287+
*size, readPrice, writePrice, lock, preferred_blobbers, blobber_auth_tickets, thirdPartyExtendable, isEnterprise, force, &fileOptionParams)
288288
if err != nil {
289289
log.Fatal("Error creating allocation: ", err)
290290
}

cmd/storage.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cmd
22

33
import (
44
"fmt"
5-
"github.com/0chain/gosdk/zcncore"
65
"log"
76
"time"
87

@@ -83,11 +82,6 @@ var lsBlobers = &cobra.Command{
8382
log.Fatalf("Failed to get blobbers: %v", err)
8483
}
8584

86-
isActivated, err := zcncore.IsHardforkActivated("hermes")
87-
log.Println("IsActivated: ", isActivated)
88-
log.Fatal(err)
89-
return
90-
9185
if doJSON {
9286
util.PrintJSON(list)
9387
} else {

cmd/updateallocation.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ var updateAllocationCmd = &cobra.Command{
131131
allocUnderRepair = true
132132
if txnHash, err := allocationObj.UpdateWithRepair(
133133
size,
134-
0,
135134
extend,
136135
lock,
137136
addBlobberId,
@@ -155,7 +154,6 @@ var updateAllocationCmd = &cobra.Command{
155154
} else {
156155
txnHash, _, err := sdk.UpdateAllocation(
157156
size,
158-
0,
159157
extend,
160158
allocID,
161159
lock,

0 commit comments

Comments
 (0)