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.

Sign up for GitHub

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

修改只能请求http问题 #278

Closed
wants to merge 12 commits into from
Closed

修改只能请求http问题 #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9c62246
修改只能请求http问题
victor7780 May 27, 2024
97690d8
Update go_client.go
victor7780 May 27, 2024
664fdaa
Update go_client_test.go
victor7780 May 27, 2024
d794764
Update api_handler.go
victor7780 May 27, 2024
0d498fc
Update console.go
victor7780 May 27, 2024
a075338
Update main.go
victor7780 May 27, 2024
4a4061a
Update root.go
victor7780 May 27, 2024
d784b20
Update chain_governance.go
victor7780 May 27, 2024
2842167
Update cns.go
victor7780 May 27, 2024
3f1eb8a
Update connection.go
victor7780 May 27, 2024
138514e
Update channel.go
victor7780 May 27, 2024
f7da802
Update go.mod
victor7780 May 27, 2024
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
4 changes: 2 additions & 2 deletions client/api_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"strings"
"time"

"github.com/FISCO-BCOS/go-sdk/conn"
"github.com/FISCO-BCOS/go-sdk/core/types"
"github.com/victor7780/go-sdk/conn"
"github.com/victor7780/go-sdk/core/types"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
Expand Down
8 changes: 4 additions & 4 deletions client/go_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
"strconv"
"strings"

"github.com/FISCO-BCOS/go-sdk/abi/bind"
"github.com/FISCO-BCOS/go-sdk/conf"
"github.com/FISCO-BCOS/go-sdk/conn"
"github.com/FISCO-BCOS/go-sdk/core/types"
"github.com/victor7780/go-sdk/abi/bind"
"github.com/victor7780/go-sdk/conf"
"github.com/victor7780/go-sdk/conn"
"github.com/victor7780/go-sdk/core/types"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
Expand Down Expand Up @@ -179,7 +179,7 @@

// WaitMined is wrapper of bind.WaitMined
func (c *Client) WaitMined(tx *types.Transaction) (*types.Receipt, error) {
return bind.WaitMined(context.Background(), c, tx)

Check failure on line 182 in client/go_client.go

View workflow job for this annotation

GitHub Actions / coverage 

cannot use bind.WaitMined(context.Background(), c, tx) (value of type *"github.com/FISCO-BCOS/go-sdk/core/types".Receipt) as type *"github.com/victor7780/go-sdk/core/types".Receipt in return statement

Check failure on line 182 in client/go_client.go

View workflow job for this annotation

GitHub Actions / coverage 

cannot use c (variable of type *Client) as type bind.DeployBackend in argument to bind.WaitMined:

Check failure on line 182 in client/go_client.go

View workflow job for this annotation

GitHub Actions / coverage 

cannot use tx (variable of type *"github.com/victor7780/go-sdk/core/types".Transaction) as type *"github.com/FISCO-BCOS/go-sdk/core/types".Transaction in argument to bind.WaitMined
}

// SMCrypto returns true if use sm crypto
Expand Down
6 changes: 3 additions & 3 deletions client/go_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"testing"

"github.com/FISCO-BCOS/go-sdk/abi"
"github.com/FISCO-BCOS/go-sdk/abi/bind"
"github.com/FISCO-BCOS/go-sdk/conf"
"github.com/victor7780/go-sdk/abi"
"github.com/victor7780/go-sdk/abi/bind"
"github.com/victor7780/go-sdk/conf"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/abigen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"regexp"
"strings"

"github.com/FISCO-BCOS/go-sdk/abi"
"github.com/FISCO-BCOS/go-sdk/abi/bind"
"github.com/victor7780/go-sdk/abi"
"github.com/victor7780/go-sdk/abi/bind"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common/compiler"
"github.com/ethereum/go-ethereum/crypto"
Expand Down
2 changes: 1 addition & 1 deletion cmd/commandline/chain_governance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strconv"

"github.com/FISCO-BCOS/go-sdk/precompiled/chaingovernance"
"github.com/victor7780/go-sdk/precompiled/chaingovernance"
"github.com/ethereum/go-ethereum/common"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/commandline/cns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package commandline
import (
"fmt"

"github.com/FISCO-BCOS/go-sdk/precompiled/cns"
"github.com/victor7780/go-sdk/precompiled/cns"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/commandline/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"log"
"os"

"github.com/FISCO-BCOS/go-sdk/client"
"github.com/FISCO-BCOS/go-sdk/conf"
"github.com/victor7780/go-sdk/client"
"github.com/victor7780/go-sdk/conf"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/console.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/FISCO-BCOS/go-sdk/cmd/commandline"
"github.com/victor7780/go-sdk/cmd/commandline"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion conn/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"time"

"github.com/FISCO-BCOS/crypto/tls"
"github.com/FISCO-BCOS/go-sdk/core/types"
"github.com/victor7780/go-sdk/core/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/google/uuid"
Expand Down
8 changes: 4 additions & 4 deletions conn/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"github.com/FISCO-BCOS/crypto/tls"
"github.com/FISCO-BCOS/crypto/x509"
"github.com/FISCO-BCOS/go-sdk/core/types"
"github.com/victor7780/go-sdk/core/types"
)

var (
Expand Down Expand Up @@ -148,9 +148,9 @@ func (op *requestOp) wait(ctx context.Context, c *Connection) (*jsonrpcMessage,
// not affect subsequent interactions with the client.
func DialContextHTTP(rawurl string) (*Connection, error) {
rawurl = strings.ToLower(rawurl)
if !strings.Contains(rawurl, "http://") {
rawurl = "http://" + rawurl
}
//if !strings.Contains(rawurl, "http://") {
// rawurl = "http://" + rawurl
//}
return DialHTTP(rawurl)
}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/FISCO-BCOS/go-sdk
module github.com/victor7780/go-sdk

go 1.18

Expand Down
Loading