Skip to content

Commit 706c66f

Browse files
Jayashsatolia403Jayashsatolia403
committed
feat: enhance allocation tests with dynamic ID generation and update blobber auth ticket retrieval
1 parent d4bb04d commit 706c66f

File tree

5 files changed

+50
-16
lines changed

5 files changed

+50
-16
lines changed

‎tests/api_tests/0box_allocation_test.go

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package api_tests
22

33
import (
4+
"crypto/sha256"
5+
"encoding/hex"
6+
"fmt"
47
"testing"
8+
"time"
59

610
"github.com/0chain/system_test/internal/api/util/client"
711

@@ -10,8 +14,18 @@ import (
1014
)
1115

1216
func NewTestAllocation() map[string]string {
17+
// Generate a unique string using the current timestamp
18+
uniqueString := fmt.Sprintf("%d", time.Now().UnixNano())
19+
20+
// Create a new hash
21+
hasher := sha256.New()
22+
hasher.Write([]byte(uniqueString))
23+
24+
// Get the hash and convert it to a hexadecimal string
25+
id := hex.EncodeToString(hasher.Sum(nil))
26+
1327
return map[string]string{
14-
"id": "165f0f8e557c430929784035df7eeacf7a3ff795f10d76c8707409bba31cb617",
28+
"id": id,
1529
"description": "test_allocation_description",
1630
"name": "test_allocation_name",
1731
"allocation_type": "external_drive",
@@ -79,6 +93,7 @@ func Test0BoxAllocation(testSetup *testing.T) {
7993
require.NoError(t, err)
8094

8195
allocInput := NewTestAllocation()
96+
allocInput["id"] = "c0360331837a7376d27007614e124db83811e4416dd2f1577345dd96c8621bf6"
8297
_, response, err := zboxClient.CreateAllocation(t, headers, allocInput)
8398
require.NoError(t, err)
8499
require.Equal(t, 201, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())

‎tests/cli_tests/config/wallets/zbox_team_wallet.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"client_id":"65b32a635cffb6b6f3c73f09da617c29569a5f690662b5be57ed0d994f234335","client_key":"381fb2e8298680fc9c71e664821394adaa5db4537456aaa257ef4388ba8c090e476c89fbcd2c8a1b0871ba36b7001f778d178c8dfff1504fbafb43f7ee3b3c92","keys":[{"public_key":"381fb2e8298680fc9c71e664821394adaa5db4537456aaa257ef4388ba8c090e476c89fbcd2c8a1b0871ba36b7001f778d178c8dfff1504fbafb43f7ee3b3c92","private_key":"85e2119f494cd40ca524f6342e8bdb7bef2af03fe9a08c8d9c1d9f14d6c64f14"}],"mnemonics":"immense express entire board prize loop mushroom wild sunset stuff mixture analyst video that trouble soccer elder fall portion arrow eagle leaf enforce mesh","version":"1.0","date_created":"2023-05-01T18:40:02Z","nonce":0}
1+
{"client_id":"d4c5ad2959282b05a1c267c542c859271670da1b0b44f0714babfb87e57c3c83","client_key":"d7dba8a72b5752b37001d07247e3c7c475c6cb5374962ce608965aeefaa999142b3adfd34e9c1c9949210c05c45b5b51ddb83a3234b56983b3936b25717d6c8d","peer_public_key":"","keys":[{"public_key":"d7dba8a72b5752b37001d07247e3c7c475c6cb5374962ce608965aeefaa999142b3adfd34e9c1c9949210c05c45b5b51ddb83a3234b56983b3936b25717d6c8d","private_key":"26e4adfa189350df06bf1983569e03a50fb69d6112386e76610e8b08cc90a009"}],"mnemonics":"now segment air treat fame sport trouble open shed jewel bird shock cave shove quick embody hundred hole replace cheap mammal panel recycle decorate","version":"1.0","date_created":"2025-03-13T16:19:26Z","nonce":0,"is_split":false}

‎tests/cli_tests/zboxcli_blobber_config_update_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func TestBlobberConfigUpdate(testSetup *testing.T) {
192192

193193
output, err := updateBlobberInfo(t, configPath, "")
194194
require.NotNil(t, err, strings.Join(output, "\n"))
195-
require.Len(t, output, 30, "Expected length", len(output))
195+
require.Len(t, output, 32, "Expected length", len(output))
196196
require.Equalf(t, "Error: required flag(s) \"blobber_id\" not set", output[0], "output was: %s", output[0])
197197
})
198198

‎tests/cli_tests/zboxcli_restricted_blobber_test.go

+31-12
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ package cli_tests
33
import (
44
"encoding/hex"
55
"encoding/json"
6+
"github.com/0chain/errors"
7+
"io/ioutil"
68
"net/http"
79
"os"
810
"path/filepath"
911
"regexp"
12+
"strconv"
1013
"strings"
1114
"testing"
1215
"time"
@@ -21,6 +24,10 @@ import (
2124

2225
func TestRestrictedBlobbers(testSetup *testing.T) {
2326
t := test.NewSystemTest(testSetup)
27+
28+
//Auth Ticket Round expiry we can add a big round number to create the allocation.
29+
authTokenRoundExpiry := int(1e9)
30+
2431
t.SetSmokeTests("Create allocation for locking cost equal to the cost calculated should work")
2532

2633
t.TestSetup("register wallet and get blobbers", func() {
@@ -92,9 +99,9 @@ func TestRestrictedBlobbers(testSetup *testing.T) {
9299
wallet, err := getWallet(t, configPath)
93100
require.Nil(t, err, "could not get wallet")
94101

95-
blobber1AuthTicket, err := getBlobberAuthTicket(t, blobber1.Id, blobber1.Url, wallet.ClientID)
102+
blobber1AuthTicket, err := getBlobberAuthTicket(t, blobber1.Id, blobber1.Url, wallet.ClientID, authTokenRoundExpiry)
96103
require.Nil(t, err, "could not get blobber1 auth ticket")
97-
blobber2AuthTicket, err := getBlobberAuthTicket(t, blobber2.Id, blobber2.Url, wallet.ClientID)
104+
blobber2AuthTicket, err := getBlobberAuthTicket(t, blobber2.Id, blobber2.Url, wallet.ClientID, authTokenRoundExpiry)
98105
require.Nil(t, err, "could not get blobber2 auth ticket")
99106

100107
var preferredBlobbers, blobberAuthTickets string
@@ -114,7 +121,16 @@ func TestRestrictedBlobbers(testSetup *testing.T) {
114121
}
115122
}
116123

117-
options = map[string]interface{}{"size": "1024", "data": "3", "parity": "3", "lock": "0.5", "preferred_blobbers": preferredBlobbers, "blobber_auth_tickets": blobberAuthTickets, "force": "true"}
124+
options = map[string]interface{}{
125+
"size": "1024",
126+
"data": "3",
127+
"parity": "3",
128+
"lock": "0.5",
129+
"preferred_blobbers": preferredBlobbers,
130+
"blobber_auth_tickets": blobberAuthTickets,
131+
"auth_round_expiry": authTokenRoundExpiry,
132+
"force": "true",
133+
}
118134
output, err = createNewAllocation(t, configPath, createParams(options))
119135
require.Nil(t, err, strings.Join(output, "\n"))
120136
require.True(t, len(output) > 0, "expected output length be at least 1")
@@ -216,7 +232,7 @@ func TestRestrictedBlobbers(testSetup *testing.T) {
216232
"is_restricted": false,
217233
}))
218234
require.Nil(t, err, strings.Join(output, "\n"))
219-
addBlobberAuthTicket, err := getBlobberAuthTicket(t, blobberID, addBlobber.BaseURL, wallet.ClientID)
235+
addBlobberAuthTicket, err := getBlobberAuthTicket(t, blobberID, addBlobber.BaseURL, wallet.ClientID, authTokenRoundExpiry)
220236
require.Nil(t, err)
221237

222238
t.Cleanup(func() {
@@ -232,6 +248,7 @@ func TestRestrictedBlobbers(testSetup *testing.T) {
232248
"allocation": allocationID,
233249
"set_third_party_extendable": nil,
234250
"add_blobber": blobberID,
251+
"auth_round_expiry": authTokenRoundExpiry,
235252
"add_blobber_auth_ticket": addBlobberAuthTicket,
236253
})
237254

@@ -287,7 +304,7 @@ func TestRestrictedBlobbers(testSetup *testing.T) {
287304
"is_restricted": false,
288305
}))
289306
require.Nil(t, err, strings.Join(output, "\n"))
290-
addBlobberAuthTicket, err := getBlobberAuthTicket(t, blobberID, addBlobber.BaseURL, wallet.ClientID)
307+
addBlobberAuthTicket, err := getBlobberAuthTicket(t, blobberID, addBlobber.BaseURL, wallet.ClientID, authTokenRoundExpiry)
291308
require.Nil(t, err)
292309

293310
t.Cleanup(func() {
@@ -304,6 +321,7 @@ func TestRestrictedBlobbers(testSetup *testing.T) {
304321
"set_third_party_extendable": nil,
305322
"add_blobber": blobberID,
306323
"add_blobber_auth_ticket": addBlobberAuthTicket,
324+
"auth_round_expiry": authTokenRoundExpiry,
307325
"remove_blobber": removeBlobber,
308326
})
309327

@@ -317,22 +335,22 @@ func TestRestrictedBlobbers(testSetup *testing.T) {
317335
})
318336
}
319337

320-
func getBlobberAuthTicket(t *test.SystemTest, blobberID, blobberUrl, clientID string) (string, error) {
338+
func getBlobberAuthTicket(t *test.SystemTest, blobberID, blobberURL, clientID string, authTokenRoundExpiry int) (string, error) {
321339
zboxWallet, err := getWalletForName(t, configPath, zboxTeamWallet)
322340
require.Nil(t, err, "could not get zbox wallet")
323341

324342
var authTicket string
325343
signatureScheme := zcncrypto.NewSignatureScheme("bls0chain")
326-
_ = signatureScheme.SetPrivateKey("85e2119f494cd40ca524f6342e8bdb7bef2af03fe9a08c8d9c1d9f14d6c64f14")
344+
_ = signatureScheme.SetPrivateKey("26e4adfa189350df06bf1983569e03a50fb69d6112386e76610e8b08cc90a009")
327345
_ = signatureScheme.SetPublicKey(zboxWallet.ClientPublicKey)
328346

329347
signature, err := signatureScheme.Sign(hex.EncodeToString([]byte(zboxWallet.ClientPublicKey)))
330348
if err != nil {
331349
return authTicket, err
332350
}
333351

334-
url := blobberUrl + "/v1/auth/generate?client_id=" + clientID
335-
req, err := http.NewRequest("GET", url, http.NoBody)
352+
url := blobberURL + "/v1/auth/generate?client_id=" + clientID + "&round=" + strconv.FormatInt(int64(authTokenRoundExpiry), 10)
353+
req, err := http.NewRequest("GET", url, nil)
336354
if err != nil {
337355
return authTicket, err
338356
}
@@ -347,12 +365,13 @@ func getBlobberAuthTicket(t *test.SystemTest, blobberID, blobberUrl, clientID st
347365
var responseMap map[string]string
348366
err = json.NewDecoder(resp.Body).Decode(&responseMap)
349367
if err != nil {
350-
return "", err
368+
var body []byte
369+
body, err = ioutil.ReadAll(resp.Body)
370+
return "", errors.Wrap(err, string(body))
351371
}
352372
authTicket = responseMap["auth_ticket"]
353373
if authTicket == "" {
354-
return "", common.NewError("500", "Error getting auth ticket from blobber")
374+
common.NewError("500", "Error getting auth ticket from blobber")
355375
}
356-
357376
return authTicket, nil
358377
}

‎tests/tokenomics_tests/config/wallets/zbox_team_wallet.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"client_id":"65b32a635cffb6b6f3c73f09da617c29569a5f690662b5be57ed0d994f234335","client_key":"381fb2e8298680fc9c71e664821394adaa5db4537456aaa257ef4388ba8c090e476c89fbcd2c8a1b0871ba36b7001f778d178c8dfff1504fbafb43f7ee3b3c92","keys":[{"public_key":"381fb2e8298680fc9c71e664821394adaa5db4537456aaa257ef4388ba8c090e476c89fbcd2c8a1b0871ba36b7001f778d178c8dfff1504fbafb43f7ee3b3c92","private_key":"85e2119f494cd40ca524f6342e8bdb7bef2af03fe9a08c8d9c1d9f14d6c64f14"}],"mnemonics":"immense express entire board prize loop mushroom wild sunset stuff mixture analyst video that trouble soccer elder fall portion arrow eagle leaf enforce mesh","version":"1.0","date_created":"2023-05-01T18:40:02Z","nonce":0}
1+
{"client_id":"d4c5ad2959282b05a1c267c542c859271670da1b0b44f0714babfb87e57c3c83","client_key":"d7dba8a72b5752b37001d07247e3c7c475c6cb5374962ce608965aeefaa999142b3adfd34e9c1c9949210c05c45b5b51ddb83a3234b56983b3936b25717d6c8d","peer_public_key":"","keys":[{"public_key":"d7dba8a72b5752b37001d07247e3c7c475c6cb5374962ce608965aeefaa999142b3adfd34e9c1c9949210c05c45b5b51ddb83a3234b56983b3936b25717d6c8d","private_key":"26e4adfa189350df06bf1983569e03a50fb69d6112386e76610e8b08cc90a009"}],"mnemonics":"now segment air treat fame sport trouble open shed jewel bird shock cave shove quick embody hundred hole replace cheap mammal panel recycle decorate","version":"1.0","date_created":"2025-03-13T16:19:26Z","nonce":0,"is_split":false}

0 commit comments

Comments
 (0)