Skip to content

Commit b67be7e

Browse files
smaulik13smaulik13
authored
Fixes for create owner tests (#1140)
* 0box fixes * lint fixeS * lint fix
1 parent e3e38b0 commit b67be7e

File tree

11 files changed

+85
-73
lines changed

11 files changed

+85
-73
lines changed

‎internal/api/util/client/sdk.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package client
33
import (
44
"bytes"
55
"crypto/rand"
6-
"fmt"
7-
"github.com/0chain/gosdk/core/client"
8-
"github.com/0chain/gosdk/zcncore"
96
"io"
107
"os"
118
"path/filepath"
129
"sync"
1310

11+
"github.com/0chain/gosdk/core/client"
12+
"github.com/0chain/gosdk/zcncore"
13+
1414
"github.com/0chain/gosdk/constants"
1515
"github.com/0chain/gosdk/core/conf"
1616
"github.com/0chain/gosdk/zboxcore/blockchain"
@@ -109,10 +109,7 @@ func (c *SDKClient) SetWallet(t *test.SystemTest, wallet *model.Wallet) {
109109
require.NoError(t, err, ErrInitStorageSDK)
110110

111111
err = zcncore.SetGeneralWalletInfo(serializedWallet, crypto.BLS0Chain)
112-
if err != nil {
113-
fmt.Println("Error in sdk init", err)
114-
os.Exit(1)
115-
}
112+
require.NoError(t, err, "Error in Setting general wallet info")
116113
}
117114

118115
func (c *SDKClient) UploadFile(t *test.SystemTest, allocationID string, options ...int64) (tmpFilePath string, actualSizeUploaded int64) {

‎internal/api/util/client/zbox_client.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,22 @@ func (c *ZboxClient) NewZboxHeaders_R(appType string) map[string]string {
9292
return zboxHeaders
9393
}
9494

95-
func (c *ZboxClient) CreateOwner(t *test.SystemTest, headers, owner map[string]string) (*model.ZboxOwner, *resty.Response, error) {
96-
t.Logf("creating owner for userID [%v] using 0box...", headers["X-App-User-ID"])
97-
var zboxOwner *model.ZboxOwner
95+
func (c *ZboxClient) VerifyOtpDetails(t *test.SystemTest, headers, verifyOtpInput map[string]string) (*model.ZboxMessageResponse, *resty.Response, error) {
96+
t.Logf("verify otp and creating owner for userID [%v] using 0box...", headers["X-App-User-ID"])
97+
var zboxMessageRes *model.ZboxMessageResponse
9898

9999
urlBuilder := NewURLBuilder()
100100
err := urlBuilder.MustShiftParse(c.zboxEntrypoint)
101101
require.NoError(t, err, "URL parse error")
102-
urlBuilder.SetPath("/v2/owner")
102+
urlBuilder.SetPath("/v2/twilio/phone/verify/signup")
103103

104104
resp, err := c.executeForServiceProvider(t, urlBuilder.String(), model.ExecutionRequest{
105-
Dst: &zboxOwner,
106-
FormData: owner,
105+
Dst: &zboxMessageRes,
106+
FormData: verifyOtpInput,
107107
Headers: headers,
108-
RequiredStatusCode: 201,
108+
RequiredStatusCode: 200,
109109
}, HttpPOSTMethod)
110-
return zboxOwner, resp, err
110+
return zboxMessageRes, resp, err
111111
}
112112

113113
func (c *ZboxClient) UpdateOwner(t *test.SystemTest, headers, owner map[string]string) (*model.ZboxMessageResponse, *resty.Response, error) {

‎tests/api_tests/0box_allocation_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ func NewTestAllocation() map[string]string {
1919
}
2020

2121
func Create0boxTestAllocation(t *test.SystemTest, headers map[string]string) error {
22-
ownerInput := NewTestOwner()
23-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
22+
verifyOtpInput := NewVerifyOtpDetails()
23+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
2424
if err != nil {
2525
return err
2626
}

‎tests/api_tests/0box_owner_test.go

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,46 @@ func NewTestOwner() map[string]string {
2222
}
2323
}
2424

25+
func NewVerifyOtpDetails() map[string]string {
26+
return map[string]string{
27+
"username": "test_owner_1",
28+
"email": "test_email_1",
29+
"phone_number": "+919876543210",
30+
"otp": "123456",
31+
"firebase_token": "test_firebase_token",
32+
"user_id": client.X_APP_USER_ID,
33+
}
34+
}
35+
2536
func Test0BoxOwner(testSetup *testing.T) {
2637
t := test.NewSystemTest(testSetup)
2738

2839
t.RunSequentially("create owner without existing userID should work", func(t *test.SystemTest) {
2940
headers := zboxClient.NewZboxHeaders(client.X_APP_BLIMP)
3041
Teardown(t, headers)
3142

32-
ownerInput := NewTestOwner()
33-
ownerInput["biography"] = "test_biography"
34-
_, response, err := zboxClient.CreateOwner(t, headers, ownerInput)
43+
verifyOtpInput := NewVerifyOtpDetails()
44+
_, response, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
3545
require.NoError(t, err)
36-
require.Equal(t, 201, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
46+
require.Equal(t, 200, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
3747

3848
owner, response, err := zboxClient.GetOwner(t, headers)
3949
require.NoError(t, err)
4050
require.Equal(t, 200, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
41-
require.Equal(t, ownerInput["username"], owner.UserName)
42-
require.Equal(t, ownerInput["email"], owner.Email)
43-
require.Equal(t, ownerInput["phone_number"], owner.PhoneNumber)
44-
require.Equal(t, ownerInput["biography"], owner.Biography)
51+
require.Equal(t, verifyOtpInput["username"], owner.UserName)
52+
require.Equal(t, verifyOtpInput["email"], owner.Email)
53+
require.Equal(t, verifyOtpInput["phone_number"], owner.PhoneNumber)
4554
})
4655

4756
t.RunSequentially("create owner with existing userID should not work", func(t *test.SystemTest) {
4857
headers := zboxClient.NewZboxHeaders(client.X_APP_BLIMP)
4958
Teardown(t, headers)
5059

51-
ownerInput := NewTestOwner()
52-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
60+
verifyOtpInput := NewVerifyOtpDetails()
61+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
5362
require.NoError(t, err)
5463

55-
_, response, err := zboxClient.CreateOwner(t, headers, ownerInput)
64+
_, response, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
5665
require.NoError(t, err)
5766
require.Equal(t, 400, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
5867
})
@@ -61,10 +70,11 @@ func Test0BoxOwner(testSetup *testing.T) {
6170
headers := zboxClient.NewZboxHeaders(client.X_APP_BLIMP)
6271
Teardown(t, headers)
6372

64-
ownerInput := NewTestOwner()
65-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
73+
verifyOtpInput := NewVerifyOtpDetails()
74+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
6675
require.NoError(t, err)
6776

77+
ownerInput := NewTestOwner()
6878
ownerInput["username"] = "new_user_name"
6979
ownerInput["biography"] = "new_biography"
7080
message, _, err := zboxClient.UpdateOwner(t, headers, ownerInput)

‎tests/api_tests/0box_referral_test.go

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,14 @@ func Test0BoxReferral(testSetup *testing.T) {
5757
require.NotNil(t, zboxRferral)
5858
require.Equal(t, 200, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
5959

60-
_, response, err = zboxClient.CreateOwner(t, referralHeaders, map[string]string{"username": "referred_user", "email": "[email protected]", "phone_number": "+15446424343"})
60+
verifyOtpInput := NewVerifyOtpDetails()
61+
verifyOtpInput["user_id"] = client.X_APP_USER_ID_R
62+
verifyOtpInput["username"] = "referred_user"
63+
verifyOtpInput["email"] = "[email protected]"
64+
verifyOtpInput["phone_number"] = "+15446424343"
65+
_, _, err = zboxClient.VerifyOtpDetails(t, referralHeaders, verifyOtpInput)
6166
require.NoError(t, err)
62-
require.Equal(t, 201, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
67+
require.Equal(t, 200, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
6368

6469
zboxWallet, response, err := zboxClient.CreateWallet(t, referralHeaders, map[string]string{
6570
"name": "referred_wallet",
@@ -89,9 +94,15 @@ func Test0BoxReferralLeaderBoard(testSetup *testing.T) {
8994
require.NotNil(t, zboxRferral)
9095
require.Equal(t, 200, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
9196

92-
_, response, err = zboxClient.CreateOwner(t, referralHeaders, map[string]string{"username": "referred_user", "email": "[email protected]", "phone_number": "+14446424343"})
97+
verifyOtpInput := NewVerifyOtpDetails()
98+
verifyOtpInput["user_id"] = client.X_APP_USER_ID_R
99+
verifyOtpInput["username"] = "referred_user"
100+
verifyOtpInput["email"] = "[email protected]"
101+
verifyOtpInput["phone_number"] = "+15446424343"
102+
_, response, err = zboxClient.VerifyOtpDetails(t, referralHeaders, verifyOtpInput)
93103
require.NoError(t, err)
94-
require.Equal(t, 201, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
104+
105+
require.Equal(t, 200, response.StatusCode(), "Response status code does not match expected. Output: [%v]", response.String())
95106

96107
zboxWallet, response, err := zboxClient.CreateWallet(t, referralHeaders, map[string]string{
97108
"name": "referred_wallet",

‎tests/api_tests/0box_wallet_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ func NewTestWallet() map[string]string {
1717
}
1818

1919
func Create0boxTestWallet(t *test.SystemTest, headers map[string]string) error {
20-
ownerInput := NewTestOwner()
21-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
20+
verifyOtpInput := NewVerifyOtpDetails()
21+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
2222
if err != nil {
2323
return err
2424
}
@@ -47,8 +47,8 @@ func Test0BoxWallet(testSetup *testing.T) {
4747
headers := zboxClient.NewZboxHeaders(client.X_APP_BLIMP)
4848
Teardown(t, headers)
4949

50-
ownerInput := NewTestOwner()
51-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
50+
verifyOtpInput := NewVerifyOtpDetails()
51+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
5252
require.NoError(t, err)
5353

5454
walletInput := NewTestWallet()
@@ -69,8 +69,8 @@ func Test0BoxWallet(testSetup *testing.T) {
6969
headers := zboxClient.NewZboxHeaders(client.X_APP_BLIMP)
7070
Teardown(t, headers)
7171

72-
ownerInput := NewTestOwner()
73-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
72+
verifyOtpInput := NewVerifyOtpDetails()
73+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
7474
require.NoError(t, err)
7575

7676
walletInput := NewTestWallet()
@@ -87,8 +87,8 @@ func Test0BoxWallet(testSetup *testing.T) {
8787
headers := zboxClient.NewZboxHeaders(client.X_APP_BLIMP)
8888
Teardown(t, headers)
8989

90-
ownerInput := NewTestOwner()
91-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
90+
verifyOtpInput := NewVerifyOtpDetails()
91+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
9292
require.NoError(t, err)
9393

9494
walletInput := NewTestWallet()
@@ -111,8 +111,8 @@ func Test0BoxWallet(testSetup *testing.T) {
111111
headers := zboxClient.NewZboxHeaders(client.X_APP_BLIMP)
112112
Teardown(t, headers)
113113

114-
ownerInput := NewTestOwner()
115-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
114+
verifyOtpInput := NewVerifyOtpDetails()
115+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
116116
require.NoError(t, err)
117117

118118
walletInput := NewTestWallet()
@@ -130,8 +130,8 @@ func Test0BoxWallet(testSetup *testing.T) {
130130
headers := zboxClient.NewZboxHeaders(client.X_APP_BLIMP)
131131
Teardown(t, headers)
132132

133-
ownerInput := NewTestOwner()
134-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
133+
verifyOtpInput := NewVerifyOtpDetails()
134+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
135135
require.NoError(t, err)
136136

137137
walletInput := NewTestWallet()
@@ -159,8 +159,8 @@ func Test0BoxWallet(testSetup *testing.T) {
159159
headers := zboxClient.NewZboxHeaders(client.X_APP_BLIMP)
160160
Teardown(t, headers)
161161

162-
ownerInput := NewTestOwner()
163-
_, _, err := zboxClient.CreateOwner(t, headers, ownerInput)
162+
verifyOtpInput := NewVerifyOtpDetails()
163+
_, _, err := zboxClient.VerifyOtpDetails(t, headers, verifyOtpInput)
164164
require.NoError(t, err)
165165

166166
walletInput := NewTestWallet()

‎tests/api_tests/client_send_nonce_greater_than_some_nonce_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package api_tests
22

33
import (
44
"encoding/json"
5-
"github.com/0chain/gosdk/core/transaction"
65
"strconv"
76
"testing"
87
"time"
98

9+
"github.com/0chain/gosdk/core/transaction"
10+
1011
coreClient "github.com/0chain/gosdk/core/client"
1112
"github.com/0chain/gosdk/zcncore"
1213
"github.com/0chain/system_test/internal/api/model"

‎tests/api_tests/main_test.go

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ package api_tests
33
import (
44
"context"
55
"encoding/json"
6-
coreClient "github.com/0chain/gosdk/core/client"
7-
"github.com/0chain/gosdk/core/conf"
86
"log"
97
"os"
108
"strconv"
119
"sync"
1210
"testing"
1311
"time"
1412

13+
coreClient "github.com/0chain/gosdk/core/client"
14+
"github.com/0chain/gosdk/core/conf"
15+
1516
"github.com/0chain/system_test/internal/api/model"
1617
"github.com/0chain/system_test/internal/api/util/client"
1718
"github.com/0chain/system_test/internal/api/util/config"
@@ -129,21 +130,6 @@ func TestMain(m *testing.M) {
129130
os.Exit(m.Run())
130131
}
131132

132-
func getConfigForZcnCoreInit(blockWorker string) string {
133-
configMap := map[string]interface{}{
134-
"block_worker": blockWorker,
135-
"signature_scheme": "bls0chain",
136-
"min_submit": 50,
137-
"min_confirmation": 50,
138-
"confirmation_chain_length": 3,
139-
"max_txn_query": 5,
140-
"query_sleep_time": 5,
141-
}
142-
143-
b, _ := json.Marshal(configMap)
144-
return string(b)
145-
}
146-
147133
type WalletFile struct {
148134
ClientId string `json:"client_id"`
149135
ClientKey string `json:"client_key"`

‎tests/cli_tests/main_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ func TestMain(m *testing.M) { //nolint:gocyclo
175175
setupConfig()
176176

177177
log.Printf("Ethereum Node URL: %s", ethereumNodeURL)
178-
fmt.Println("Ethereum Node URL: ", ethereumNodeURL)
179178

180179
tenderlyClient := tenderly.NewClient(ethereumNodeURL)
181180

‎tests/cli_tests/sdk.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ import (
44
"context"
55
"crypto/rand"
66
"fmt"
7-
"github.com/0chain/gosdk/core/client"
8-
"github.com/0chain/gosdk/zcncore"
97
"io"
108
"math/big"
119
"os"
1210

11+
"github.com/0chain/gosdk/core/client"
12+
"github.com/0chain/gosdk/zcncore"
13+
1314
"github.com/0chain/gosdk/core/conf"
1415
"github.com/0chain/gosdk/zboxcore/fileref"
1516
"github.com/0chain/gosdk/zboxcore/sdk"
@@ -51,11 +52,14 @@ func InitSDK(wallet, configFile string) error {
5152
parsed.SignatureScheme,
5253
0, true,
5354
)
55+
if err != nil {
56+
return err
57+
}
5458

5559
err = zcncore.SetGeneralWalletInfo(walletJSON, parsed.SignatureScheme)
5660
if err != nil {
5761
fmt.Println("Error in sdk init", err)
58-
os.Exit(1)
62+
return err
5963
}
6064

6165
if client.GetClient().IsSplit {

0 commit comments

Comments
 (0)