Commit 47dc129b authored by hezhengjun's avatar hezhengjun Committed by vipwzw

fix linter error

parent 87dfa6d4
...@@ -37,10 +37,10 @@ chain33EthTokenAddr="" ...@@ -37,10 +37,10 @@ chain33EthTokenAddr=""
ethereumBtyTokenAddr="" ethereumBtyTokenAddr=""
chain33YccTokenAddr="" chain33YccTokenAddr=""
ethereumYccTokenAddr="" ethereumYccTokenAddr=""
BridgeRegistryOnChain33="" #BridgeRegistryOnChain33=""
chain33YccErc20Addr="" #chain33YccErc20Addr=""
BridgeRegistryOnEth="" #BridgeRegistryOnEth=""
ethBridgeToeknYccAddr="" #ethBridgeToeknYccAddr=""
chain33ZBCErc20Addr="" chain33ZBCErc20Addr=""
ethBridgeToeknZBCAddr="" ethBridgeToeknZBCAddr=""
multisignChain33Addr="" multisignChain33Addr=""
......
...@@ -59,7 +59,7 @@ chain33ValidatorKeyd="0x3818b257b05ee75b6e43ee0e3cfc2d8502342cf67caed533e3756966 ...@@ -59,7 +59,7 @@ chain33ValidatorKeyd="0x3818b257b05ee75b6e43ee0e3cfc2d8502342cf67caed533e3756966
#CLIA="./ebcli_A" #CLIA="./ebcli_A"
ethUrl="" #ethUrl=""
function start_docker_ebrelayerA() { function start_docker_ebrelayerA() {
...@@ -121,7 +121,7 @@ function StartDockerRelayerDeploy() { ...@@ -121,7 +121,7 @@ function StartDockerRelayerDeploy() {
# change EthProvider url # change EthProvider url
dockerAddr=$(get_docker_addr "${dockerNamePrefix}_ganachetest_1") dockerAddr=$(get_docker_addr "${dockerNamePrefix}_ganachetest_1")
ethUrl="http://${dockerAddr}:8545" # ethUrl="http://${dockerAddr}:8545"
# 修改 relayer.toml 配置文件 # 修改 relayer.toml 配置文件
updata_relayer_a_toml "${dockerAddr}" "${dockerNamePrefix}_ebrelayera_1" "./relayer.toml" updata_relayer_a_toml "${dockerAddr}" "${dockerNamePrefix}_ebrelayera_1" "./relayer.toml"
......
package main package main
// //
//import ( //import (
// "context" // "context"
......
package main package main
// //
//import ( //import (
// "context" // "context"
......
package test package test
// //
//import ( //import (
// "encoding/hex" // "encoding/hex"
......
...@@ -70,7 +70,7 @@ func DeployPancakeCmd() *cobra.Command { ...@@ -70,7 +70,7 @@ func DeployPancakeCmd() *cobra.Command {
func DeployContractsCake(cmd *cobra.Command, args []string) { func DeployContractsCake(cmd *cobra.Command, args []string) {
ethNodeAddr, _ := cmd.Flags().GetString("rpc_laddr_ethereum") ethNodeAddr, _ := cmd.Flags().GetString("rpc_laddr_ethereum")
key,_:=cmd.Flags().GetString("key") key, _ := cmd.Flags().GetString("key")
setupWebsocketEthClient(ethNodeAddr) setupWebsocketEthClient(ethNodeAddr)
err := DeployPancake(key) err := DeployPancake(key)
if nil != err { if nil != err {
...@@ -102,7 +102,7 @@ func AddAllowance4LPFlags(cmd *cobra.Command) { ...@@ -102,7 +102,7 @@ func AddAllowance4LPFlags(cmd *cobra.Command) {
cmd.Flags().Int64P("amount", "p", 0, "amount to approve") cmd.Flags().Int64P("amount", "p", 0, "amount to approve")
_ = cmd.MarkFlagRequired("amount") _ = cmd.MarkFlagRequired("amount")
cmd.Flags().StringP("key","k","","private key") cmd.Flags().StringP("key", "k", "", "private key")
} }
...@@ -111,11 +111,11 @@ func AddAllowance4LP(cmd *cobra.Command, args []string) { ...@@ -111,11 +111,11 @@ func AddAllowance4LP(cmd *cobra.Command, args []string) {
amount, _ := cmd.Flags().GetInt64("amount") amount, _ := cmd.Flags().GetInt64("amount")
lpToken, _ := cmd.Flags().GetString("lptoken") lpToken, _ := cmd.Flags().GetString("lptoken")
ethNodeAddr, _ := cmd.Flags().GetString("rpc_laddr_ethereum") ethNodeAddr, _ := cmd.Flags().GetString("rpc_laddr_ethereum")
privkey,_:=cmd.Flags().GetString("key") privkey, _ := cmd.Flags().GetString("key")
setupWebsocketEthClient(ethNodeAddr) setupWebsocketEthClient(ethNodeAddr)
//owner string, spender string, amount int64 //owner string, spender string, amount int64
err := AddAllowance4LPHandle(lpToken, masterChefAddrStr,privkey, amount) err := AddAllowance4LPHandle(lpToken, masterChefAddrStr, privkey, amount)
if nil != err { if nil != err {
fmt.Println("Failed to AddPool2Farm due to:", err.Error()) fmt.Println("Failed to AddPool2Farm due to:", err.Error())
return return
...@@ -142,21 +142,20 @@ func CheckAllowance4LPFlags(cmd *cobra.Command) { ...@@ -142,21 +142,20 @@ func CheckAllowance4LPFlags(cmd *cobra.Command) {
cmd.Flags().StringP("lptoken", "l", "", "lp Addr ") cmd.Flags().StringP("lptoken", "l", "", "lp Addr ")
_ = cmd.MarkFlagRequired("lptoken") _ = cmd.MarkFlagRequired("lptoken")
cmd.Flags().StringP("key","k","","private key") cmd.Flags().StringP("key", "k", "", "private key")
} }
func CheckAllowance4LP(cmd *cobra.Command, args []string) { func CheckAllowance4LP(cmd *cobra.Command, args []string) {
masterChefAddrStr, _ := cmd.Flags().GetString("masterchef") masterChefAddrStr, _ := cmd.Flags().GetString("masterchef")
lpToken, _ := cmd.Flags().GetString("lptoken") lpToken, _ := cmd.Flags().GetString("lptoken")
privkey,_:=cmd.Flags().GetString("key") privkey, _ := cmd.Flags().GetString("key")
ethNodeAddr, _ := cmd.Flags().GetString("rpc_laddr_ethereum") ethNodeAddr, _ := cmd.Flags().GetString("rpc_laddr_ethereum")
setupWebsocketEthClient(ethNodeAddr) setupWebsocketEthClient(ethNodeAddr)
//owner string, spender string, amount int64 //owner string, spender string, amount int64
err := CheckAllowance4LPHandle(lpToken, masterChefAddrStr,privkey) err := CheckAllowance4LPHandle(lpToken, masterChefAddrStr, privkey)
if nil != err { if nil != err {
fmt.Println("Failed to CheckAllowance4LP due to:", err.Error()) fmt.Println("Failed to CheckAllowance4LP due to:", err.Error())
return return
...@@ -179,18 +178,18 @@ func showPairInitCodeHashCmd() *cobra.Command { ...@@ -179,18 +178,18 @@ func showPairInitCodeHashCmd() *cobra.Command {
func showPairInitCodeHashFlags(cmd *cobra.Command) { func showPairInitCodeHashFlags(cmd *cobra.Command) {
cmd.Flags().StringP("factory", "f", "", "factory address") cmd.Flags().StringP("factory", "f", "", "factory address")
_ = cmd.MarkFlagRequired("factory") _ = cmd.MarkFlagRequired("factory")
cmd.Flags().StringP("key","k","","private key") cmd.Flags().StringP("key", "k", "", "private key")
} }
func showPairInitCodeHash(cmd *cobra.Command, args []string) { func showPairInitCodeHash(cmd *cobra.Command, args []string) {
factory, _ := cmd.Flags().GetString("factory") factory, _ := cmd.Flags().GetString("factory")
ethNodeAddr, _ := cmd.Flags().GetString("rpc_laddr_ethereum") ethNodeAddr, _ := cmd.Flags().GetString("rpc_laddr_ethereum")
privkey,_:=cmd.Flags().GetString("key") privkey, _ := cmd.Flags().GetString("key")
setupWebsocketEthClient(ethNodeAddr) setupWebsocketEthClient(ethNodeAddr)
//owner string, spender string, amount int64 //owner string, spender string, amount int64
err := showPairInitCodeHashHandle(factory,privkey) err := showPairInitCodeHashHandle(factory, privkey)
if nil != err { if nil != err {
fmt.Println("Failed to showPairInitCodeHash due to:", err.Error()) fmt.Println("Failed to showPairInitCodeHash due to:", err.Error())
return return
......
...@@ -15,7 +15,7 @@ import ( ...@@ -15,7 +15,7 @@ import (
type SignCakeToken struct { type SignCakeToken struct {
} }
func (s *SignCakeToken) reWriteDeployCakeToken(nonce uint64, gasPrice *big.Int, key *ecdsa.PrivateKey,params... interface{}) (signedTx, hash string, err error) { func (s *SignCakeToken) reWriteDeployCakeToken(nonce uint64, gasPrice *big.Int, key *ecdsa.PrivateKey, params ...interface{}) (signedTx, hash string, err error) {
parsed, err := abi.JSON(strings.NewReader(cakeToken.CakeTokenABI)) parsed, err := abi.JSON(strings.NewReader(cakeToken.CakeTokenABI))
if err != nil { if err != nil {
return return
...@@ -33,12 +33,10 @@ func (s *SignCakeToken) reWriteDeployCakeToken(nonce uint64, gasPrice *big.Int, ...@@ -33,12 +33,10 @@ func (s *SignCakeToken) reWriteDeployCakeToken(nonce uint64, gasPrice *big.Int,
} }
type signsyrupBar struct { type signsyrupBar struct {
} }
func (s *signsyrupBar)reWriteDeploysyrupBar(nonce uint64, gasPrice *big.Int, key *ecdsa.PrivateKey,cakeAddress common.Address)(signedTx, hash string, err error){ func (s *signsyrupBar) reWriteDeploysyrupBar(nonce uint64, gasPrice *big.Int, key *ecdsa.PrivateKey, cakeAddress common.Address) (signedTx, hash string, err error) {
parsed, err := abi.JSON(strings.NewReader(syrupBar.SyrupBarABI)) parsed, err := abi.JSON(strings.NewReader(syrupBar.SyrupBarABI))
if err != nil { if err != nil {
return return
...@@ -51,20 +49,19 @@ func (s *signsyrupBar)reWriteDeploysyrupBar(nonce uint64, gasPrice *big.Int, ke ...@@ -51,20 +49,19 @@ func (s *signsyrupBar)reWriteDeploysyrupBar(nonce uint64, gasPrice *big.Int, ke
data := append(common.FromHex(abiBin), input...) data := append(common.FromHex(abiBin), input...)
var amount = new(big.Int) var amount = new(big.Int)
ntx:=types.NewContractCreation(nonce, amount, gasLimit, gasPrice, data) ntx := types.NewContractCreation(nonce, amount, gasLimit, gasPrice, data)
return SignTx(key, ntx) return SignTx(key, ntx)
} }
type signMasterChef struct{ type signMasterChef struct {
} }
func (s *signMasterChef)reWriteDeployMasterChef(nonce uint64, gasPrice *big.Int, key *ecdsa.PrivateKey,cakeAddress,syruBarAddress ,fromaddr common.Address,reward,_startBlock *big.Int)(signedTx, hash string, err error){ func (s *signMasterChef) reWriteDeployMasterChef(nonce uint64, gasPrice *big.Int, key *ecdsa.PrivateKey, cakeAddress, syruBarAddress, fromaddr common.Address, reward, _startBlock *big.Int) (signedTx, hash string, err error) {
parsed, err := abi.JSON(strings.NewReader(masterChef.MasterChefABI)) parsed, err := abi.JSON(strings.NewReader(masterChef.MasterChefABI))
if err != nil { if err != nil {
return return
} }
input, err := parsed.Pack("", cakeAddress,syruBarAddress,fromaddr,reward,_startBlock) input, err := parsed.Pack("", cakeAddress, syruBarAddress, fromaddr, reward, _startBlock)
if err != nil { if err != nil {
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment