Skip to content

Commit

Permalink
lint changes
Browse files Browse the repository at this point in the history
  • Loading branch information
chray-zhang committed Nov 14, 2024
1 parent 7acaf96 commit 11cd7a3
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 22 deletions.
14 changes: 7 additions & 7 deletions integration-tests/common/test_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ type AccountDetails struct {

// Clients to access internal methods
type Clients struct {
StarknetClient *starknet.Client
DevnetClient *starknetdevnet.DevNet
KillgraveClient *test_env_ctf.Killgrave
OCR2Client *ocr2.Client
ChainlinkClient *ChainlinkClient
GauntletClient *gauntlet.StarknetGauntlet
DockerEnv *StarknetClusterTestEnv
StarknetClient *starknet.Client
DevnetClient *starknetdevnet.DevNet
KillgraveClient *test_env_ctf.Killgrave
OCR2Client *ocr2.Client
ChainlinkClient *ChainlinkClient
GauntletClient *gauntlet.StarknetGauntlet
DockerEnv *StarknetClusterTestEnv
GauntletPPClient *gauntlet.StarknetGauntletPlusPlus
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/smoke/ocr2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func TestOCRBasic(t *testing.T) {
state.DeployCluster()
// Setting up G++ Client
rpcUrl := state.Common.RPCDetails.RPCL2External
gppPort := "http://localhost:"+ *state.TestConfig.TestConfig.Common.GauntletPlusPlusPort
gppPort := "http://localhost:" + *state.TestConfig.TestConfig.Common.GauntletPlusPlusPort
state.Clients.GauntletPPClient, err = gauntlet.NewStarknetGauntletPlusPlus(gppPort, rpcUrl, state.Account.Account, state.Account.PrivateKey)
require.NoError(t, err, "Setting up gauntlet ++ should not fail")

Expand Down
18 changes: 9 additions & 9 deletions integration-tests/testconfig/testconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,16 +183,16 @@ type Common struct {
InsideK8s *bool `toml:"inside_k8"`
User *string `toml:"user"`
// if rpc requires api key to be passed as an HTTP header
L2RPCApiKey *string `toml:"l2_rpc_url_api_key"`
L2RPCUrl *string `toml:"l2_rpc_url"`
PrivateKey *string `toml:"private_key"`
Account *string `toml:"account"`
Stateful *bool `toml:"stateful_db"`
InternalDockerRepo *string `toml:"internal_docker_repo"`
DevnetImage *string `toml:"devnet_image"`
L2RPCApiKey *string `toml:"l2_rpc_url_api_key"`
L2RPCUrl *string `toml:"l2_rpc_url"`
PrivateKey *string `toml:"private_key"`
Account *string `toml:"account"`
Stateful *bool `toml:"stateful_db"`
InternalDockerRepo *string `toml:"internal_docker_repo"`
DevnetImage *string `toml:"devnet_image"`
GauntletPlusPlusImage *string `toml:"gauntlet_plus_plus_image"`
PostgresVersion *string `toml:"postgres_version"`
GauntletPlusPlusPort *string `toml:"gauntlet_plus_plus_port"`
PostgresVersion *string `toml:"postgres_version"`
GauntletPlusPlusPort *string `toml:"gauntlet_plus_plus_port"`
}

func (c *Common) Validate() error {
Expand Down
9 changes: 4 additions & 5 deletions ops/gauntlet/gauntlet_plus_plus_starknet.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,7 @@ func (sgpp *StarknetGauntletPlusPlus) DeployOCR2ControllerContract(minSubmission
if err != nil {
return "", err
}



constructorCalldata := map[string]interface{}{
"owner": address,
"link": linkTokenAddress,
Expand Down Expand Up @@ -256,7 +255,7 @@ func (sgpp *StarknetGauntletPlusPlus) DeployOCR2ControllerProxyContract(address
if err != nil {
return "", err
}

constructorCalldata := map[string]interface{}{
"owner": address,
"address": controllerContractAddress,
Expand Down Expand Up @@ -391,7 +390,7 @@ func (sgpp *StarknetGauntletPlusPlus) SetOCRBilling(observationPaymentGjuels int
return sgpp.executeReturnsReport(&request)
}

func (sgpp *StarknetGauntletPlusPlus) DeclareOzAccount() (error) {
func (sgpp *StarknetGauntletPlusPlus) DeclareOzAccount() error {
inputMap := make(map[string]interface{})
request := Request{
Command: "starknet/chain/open-zeppelin:declare",
Expand All @@ -408,7 +407,7 @@ func (sgpp *StarknetGauntletPlusPlus) DeployOzAccount(publicKey string) (string,
}

constructorCalldata := map[string]interface{}{
"publicKey": publicKey,
"publicKey": publicKey,
}
inputMap := map[string]interface{}{
"constructorCalldata": &constructorCalldata,
Expand Down

0 comments on commit 11cd7a3

Please sign in to comment.