Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Signup tokero name fix #242

Merged
merged 2 commits into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ kyc/coinDistributionEligibility:
- signup_sunwaves
- signup_sealsend
- signup_sauces
- signup_tokero
- signup_cryptomayors
# tenantURLs:
# callfluent: https://localhost:7443/
# doctorx: https://localhost:7444/
Expand Down
4 changes: 2 additions & 2 deletions cmd/eskimo-hut/api/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -3768,11 +3768,11 @@ const docTemplate = `{
},
"example": {
"signup_callfluent": "sometoken",
"signup_cryptomayors": "sometoken",
"signup_doctorx": "sometoken",
"signup_sauces": "sometoken",
"signup_sealsend": "sometoken",
"signup_sunwaves": "sometoken",
"signup_tokero": "sometoken"
"signup_sunwaves": "sometoken"
}
},
"tweetUrl": {
Expand Down
4 changes: 2 additions & 2 deletions cmd/eskimo-hut/api/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -3761,11 +3761,11 @@
},
"example": {
"signup_callfluent": "sometoken",
"signup_cryptomayors": "sometoken",
"signup_doctorx": "sometoken",
"signup_sauces": "sometoken",
"signup_sealsend": "sometoken",
"signup_sunwaves": "sometoken",
"signup_tokero": "sometoken"
"signup_sunwaves": "sometoken"
}
},
"tweetUrl": {
Expand Down
2 changes: 1 addition & 1 deletion cmd/eskimo-hut/api/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -865,11 +865,11 @@ definitions:
type: string
example:
signup_callfluent: sometoken
signup_cryptomayors: sometoken
signup_doctorx: sometoken
signup_sauces: sometoken
signup_sealsend: sometoken
signup_sunwaves: sometoken
signup_tokero: sometoken
type: object
tweetUrl:
example: some tweet
Expand Down
2 changes: 1 addition & 1 deletion cmd/eskimo-hut/kyc.go
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ func validateScenariosData(data *verificationscenarios.VerificationMetadata) err
verificationscenarios.CoinDistributionScenarioSignUpSealsend,
verificationscenarios.CoinDistributionScenarioSignUpSauces,
verificationscenarios.CoinDistributionScenarioSignUpDoctorx,
verificationscenarios.CoinDistributionScenarioSignUpTokero,
verificationscenarios.CoinDistributionScenarioSignUpCryptomayors,
}
unsupportedTenants []verificationscenarios.TenantScenario
)
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/prometheus/common v0.60.1
github.com/prometheus/prometheus v0.300.0
github.com/redis/go-redis/v9 v9.7.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
github.com/swaggo/swag v1.16.4
github.com/telegram-mini-apps/init-data-golang v1.1.5
github.com/testcontainers/testcontainers-go v0.34.0
Expand Down Expand Up @@ -51,7 +51,7 @@ require (
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/andybalholm/cascadia v1.3.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bytedance/sonic v1.12.4 // indirect
github.com/bytedance/sonic v1.12.5 // indirect
github.com/bytedance/sonic/loader v0.2.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
Expand Down Expand Up @@ -98,7 +98,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect
github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect
github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
github.com/bytedance/sonic v1.12.4 h1:9Csb3c9ZJhfUWeMtpCDCq6BUoH5ogfDFLUgQ/jG+R0k=
github.com/bytedance/sonic v1.12.4/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
github.com/bytedance/sonic v1.12.5 h1:hoZxY8uW+mT+OpkcUWw4k0fDINtOcVavEsGfzwzFU/w=
github.com/bytedance/sonic v1.12.5/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E=
github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
Expand Down Expand Up @@ -225,8 +225,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc=
github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0=
github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs=
github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b h1:SXO0REt4iu865upYCk8aKBBJQ4BqoE0ReP23ClMu60s=
github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
Expand Down Expand Up @@ -403,8 +403,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
Expand Down
32 changes: 16 additions & 16 deletions kyc/verification_scenarios/contract.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ const (
CoinDistributionScenarioSignUpTenants Scenario = "signup_tenants"

// Tenant scenarios.
CoinDistributionScenarioSignUpSunwaves TenantScenario = "signup_sunwaves"
CoinDistributionScenarioSignUpSealsend TenantScenario = "signup_sealsend"
CoinDistributionScenarioSignUpCallfluent TenantScenario = "signup_callfluent"
CoinDistributionScenarioSignUpSauces TenantScenario = "signup_sauces"
CoinDistributionScenarioSignUpDoctorx TenantScenario = "signup_doctorx"
CoinDistributionScenarioSignUpTokero TenantScenario = "signup_tokero"
CoinDistributionScenarioSignUpSunwaves TenantScenario = "signup_sunwaves"
CoinDistributionScenarioSignUpSealsend TenantScenario = "signup_sealsend"
CoinDistributionScenarioSignUpCallfluent TenantScenario = "signup_callfluent"
CoinDistributionScenarioSignUpSauces TenantScenario = "signup_sauces"
CoinDistributionScenarioSignUpDoctorx TenantScenario = "signup_doctorx"
CoinDistributionScenarioSignUpCryptomayors TenantScenario = "signup_cryptomayors"

singUpPrefix = "signup"
)
Expand Down Expand Up @@ -62,7 +62,7 @@ type (
UserID string `uri:"userId" required:"true" allowForbiddenWriteOperation:"true" swaggerignore:"true" example:"did:ethr:0x4B73C58370AEfcEf86A6021afCDe5673511376B2"` //nolint:lll // .
ScenarioEnum Scenario `uri:"scenarioEnum" example:"join_cmc" swaggerignore:"true" required:"true" enums:"join_cmc,join_twitter,join_telegram,signup_tenants"` //nolint:lll // .
Language string `json:"language" required:"false" example:"en"`
TenantTokens map[TenantScenario]Token `json:"tenantTokens" required:"false" example:"signup_sunwaves:sometoken,signup_sealsend:sometoken,signup_callfluent:sometoken,signup_doctorx:sometoken,signup_sauces:sometoken,signup_tokero:sometoken"` //nolint:lll // .
TenantTokens map[TenantScenario]Token `json:"tenantTokens" required:"false" example:"signup_sunwaves:sometoken,signup_sealsend:sometoken,signup_callfluent:sometoken,signup_doctorx:sometoken,signup_sauces:sometoken,signup_cryptomayors:sometoken"` //nolint:lll // .
CMCProfileLink string `json:"cmcProfileLink" required:"false" example:"some profile"`
TweetURL string `json:"tweetUrl" required:"false" example:"some tweet"`
TelegramUsername string `json:"telegramUsername" required:"false" example:"some telegram username"`
Expand All @@ -85,15 +85,15 @@ const (
var (
//nolint:gochecknoglobals,gomnd // We need it to sort scenarios.
scenarioOrder = map[Scenario]int{
CoinDistributionScenarioCmc: 0,
Scenario(CoinDistributionScenarioSignUpSunwaves): 1,
Scenario(CoinDistributionScenarioSignUpCallfluent): 2,
Scenario(CoinDistributionScenarioSignUpDoctorx): 3,
Scenario(CoinDistributionScenarioSignUpSauces): 4,
Scenario(CoinDistributionScenarioSignUpSealsend): 5,
Scenario(CoinDistributionScenarioSignUpTokero): 6,
CoinDistributionScenarioTwitter: 7,
CoinDistributionScenarioTelegram: 8,
CoinDistributionScenarioCmc: 0,
Scenario(CoinDistributionScenarioSignUpSunwaves): 1,
Scenario(CoinDistributionScenarioSignUpCallfluent): 2,
Scenario(CoinDistributionScenarioSignUpDoctorx): 3,
Scenario(CoinDistributionScenarioSignUpSauces): 4,
Scenario(CoinDistributionScenarioSignUpSealsend): 5,
Scenario(CoinDistributionScenarioSignUpCryptomayors): 6,
CoinDistributionScenarioTwitter: 7,
CoinDistributionScenarioTelegram: 8,
}
)

Expand Down
Loading