Commit 81a5219c authored by 张振华's avatar 张振华 Committed by vipwzw

update

parent 04a57e12
...@@ -5,8 +5,6 @@ import ( ...@@ -5,8 +5,6 @@ import (
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/33cn/chain33/common/address"
"github.com/stretchr/testify/assert"
"io" "io"
"os" "os"
"sort" "sort"
...@@ -14,9 +12,10 @@ import ( ...@@ -14,9 +12,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/common/crypto" "github.com/33cn/chain33/common/crypto"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
...@@ -305,8 +304,6 @@ func TestSignTx(t *testing.T) { ...@@ -305,8 +304,6 @@ func TestSignTx(t *testing.T) {
remove(filename) remove(filename)
} }
func TestPubkeyAndAddress(t *testing.T) { func TestPubkeyAndAddress(t *testing.T) {
priv := "880D055D311827AB427031959F43238500D08F3EDF443EB903EC6D1A16A5783A" priv := "880D055D311827AB427031959F43238500D08F3EDF443EB903EC6D1A16A5783A"
pub := "026BD23C69F9A1D7A50F185514EDCA25AFD00DD2A92485CC1E8CDA3EDD284CA838" pub := "026BD23C69F9A1D7A50F185514EDCA25AFD00DD2A92485CC1E8CDA3EDD284CA838"
...@@ -348,4 +345,4 @@ func testOneKey(priv, pub, addr string, t *testing.T) { ...@@ -348,4 +345,4 @@ func testOneKey(priv, pub, addr string, t *testing.T) {
fmt.Println("addr:", addr) fmt.Println("addr:", addr)
fmt.Println(fmt.Sprintf("%x", bAddr)) fmt.Println(fmt.Sprintf("%x", bAddr))
assert.True(t, addr == fmt.Sprintf("%X", bAddr)) assert.True(t, addr == fmt.Sprintf("%X", bAddr))
} }
\ No newline at end of file
package rpc package rpc
import ( import (
cty "github.com/33cn/chain33/system/dapp/coins/types"
"context" "context"
"encoding/binary" "encoding/binary"
"encoding/hex" "encoding/hex"
"errors" "errors"
"flag" "flag"
"fmt" "fmt"
gty "github.com/33cn/plugin/plugin/dapp/guess/types"
"io/ioutil" "io/ioutil"
"math/rand" "math/rand"
"os" "os"
...@@ -19,8 +14,6 @@ import ( ...@@ -19,8 +14,6 @@ import (
"testing" "testing"
"time" "time"
"github.com/33cn/chain33/util"
"github.com/33cn/chain33/blockchain" "github.com/33cn/chain33/blockchain"
"github.com/33cn/chain33/common/address" "github.com/33cn/chain33/common/address"
"github.com/33cn/chain33/common/crypto" "github.com/33cn/chain33/common/crypto"
...@@ -32,24 +25,22 @@ import ( ...@@ -32,24 +25,22 @@ import (
"github.com/33cn/chain33/queue" "github.com/33cn/chain33/queue"
"github.com/33cn/chain33/rpc" "github.com/33cn/chain33/rpc"
"github.com/33cn/chain33/store" "github.com/33cn/chain33/store"
"github.com/33cn/chain33/system/consensus/solo"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
"github.com/33cn/chain33/util"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc"
_ "github.com/33cn/chain33/system" _ "github.com/33cn/chain33/system"
_ "github.com/33cn/chain33/system/consensus/solo" _ "github.com/33cn/chain33/system/consensus/solo"
_ "github.com/33cn/plugin/plugin/dapp/init"
_ "github.com/33cn/plugin/plugin/store/init"
jsonrpc "github.com/33cn/chain33/rpc/jsonclient" jsonrpc "github.com/33cn/chain33/rpc/jsonclient"
rpctypes "github.com/33cn/chain33/rpc/types" rpctypes "github.com/33cn/chain33/rpc/types"
cty "github.com/33cn/chain33/system/dapp/coins/types"
"github.com/33cn/chain33/system/consensus/solo" gty "github.com/33cn/plugin/plugin/dapp/guess/types"
_ "github.com/33cn/plugin/plugin/dapp/init"
pty "github.com/33cn/plugin/plugin/dapp/norm/types" pty "github.com/33cn/plugin/plugin/dapp/norm/types"
_ "github.com/33cn/plugin/plugin/store/init"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc"
) )
var ( var (
......
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