forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

whsiper: tests fixed

Browse source
This commit is contained in:
Vlad 2017-03-28 16:26:57 +02:00
parent b6b8488390
commit 85973778c7
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
whisper/whisperv5/api_test.go
View file

@ -148,7 +148,7 @@ func TestBasic(t *testing.T) {
t.Fatalf("failed GetSymKey(id2): %s.", err)
}
if k1 != k2 {
if !bytes.Equal(k1, k2) {
t.Fatalf("installed keys are not equal")
}
@ -347,7 +347,7 @@ func TestIntegrationAsym(t *testing.T) {
var f WhisperFilterArgs
f.Symmetric = false
f.Key = key
f.SignedWith = sigPubKey
f.SignedWith = sigPubKey.String()
f.Topics = make([][]byte, 2)
f.Topics[0] = topics[0][:]
f.Topics[1] = topics[1][:]
@ -363,7 +363,7 @@ func TestIntegrationAsym(t *testing.T) {
p.Type = "asym"
p.TTL = 2
p.SignWith = sig
p.Key = dstPubKey
p.Key = dstPubKey.String()
p.Padding = []byte("test string")
p.Payload = []byte("extended test string")
p.PowTarget = DefaultMinimumPoW
@ -449,7 +449,7 @@ func TestIntegrationSym(t *testing.T) {
f.Topics[0] = topics[0][:]
f.Topics[1] = topics[1][:]
f.MinPoW = 0.324
f.SignedWith = sigPubKey
f.SignedWith = sigPubKey.String()
f.AllowP2P = false
id, err := api.Subscribe(f)
@ -547,7 +547,7 @@ func TestIntegrationSymWithFilter(t *testing.T) {
f.Topics[0] = topics[0][:]
f.Topics[1] = topics[1][:]
f.MinPoW = 0.324
f.SignedWith = sigPubKey
f.SignedWith = sigPubKey.String()
f.AllowP2P = false
id, err := api.Subscribe(f)
@ -616,8 +616,7 @@ func TestKey(t *testing.T) {
t.Fatalf("failed to get sym key: %s.", err)
}
b := common.FromHex(s)
k2, err := api.AddSymmetricKeyDirect(b)
k2, err := api.AddSymmetricKeyDirect(s)
if err != nil {
t.Fatalf("failed to add sym key: %s.", err)
}
@ -627,11 +626,11 @@ func TestKey(t *testing.T) {
t.Fatalf("failed to get sym key: %s.", err)
}
if s != "448652d595bd6ec00b2a9ea220ad6c26592d9bf4cf79023d3c1b30cb681e6e07" {
t.Fatalf("wrong key from password")
if s.String() != "0x448652d595bd6ec00b2a9ea220ad6c26592d9bf4cf79023d3c1b30cb681e6e07" {
t.Fatalf("wrong key from password: %s", s.String())
}
if s != s2 {
if !bytes.Equal(s, s2) {
t.Fatalf("wrong key")
}
}

2
whisper/whisperv5/filter_test.go
View file

@ -691,7 +691,7 @@ func TestVariableTopics(t *testing.T) {
for i := 0; i < 4; i++ {
arr := make([]byte, i+1, 4)
copy(arr, env.Topic[0:i+1])
copy(arr, env.Topic[:i+1])
f.Topics[4] = arr
match = f.MatchEnvelope(env)