Skip to content

Cleanup redundant boolean assertions in rpc/rpchelper tests #17902

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

Closed
wants to merge 1 commit into from
Closed

Cleanup redundant boolean assertions in rpc/rpchelper tests #17902

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions rpc/rpchelper/filters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,10 @@ func TestFilters_SubscribeLogsGeneratesCorrectLogFilterRequest(t *testing.T) {
_, id1 := f.SubscribeLogs(1, criteria1)

// request should have all addresses and topics enabled
if lastFilterRequest.AllAddresses == false {
if !lastFilterRequest.AllAddresses {
t.Error("1: expected all addresses to be true")
}
if lastFilterRequest.AllTopics == false {
if !lastFilterRequest.AllTopics {
t.Error("1: expected all topics to be true")
}

Expand All @@ -286,10 +286,10 @@ func TestFilters_SubscribeLogsGeneratesCorrectLogFilterRequest(t *testing.T) {
_, id2 := f.SubscribeLogs(1, criteria2)

// request should have all addresses and all topics still and the new address
if lastFilterRequest.AllAddresses == false {
if !lastFilterRequest.AllAddresses {
t.Error("2: expected all addresses to be true")
}
if lastFilterRequest.AllTopics == false {
if !lastFilterRequest.AllTopics {
t.Error("2: expected all topics to be true")
}
if len(lastFilterRequest.Addresses) != 1 && gointerfaces.ConvertH160toAddress(lastFilterRequest.Addresses[0]) != gointerfaces.ConvertH160toAddress(address1H160) {
Expand All @@ -304,10 +304,10 @@ func TestFilters_SubscribeLogsGeneratesCorrectLogFilterRequest(t *testing.T) {
_, id3 := f.SubscribeLogs(1, criteria3)

// request should have all addresses and all topics as well as the previous address and new topic
if lastFilterRequest.AllAddresses == false {
if !lastFilterRequest.AllAddresses {
t.Error("3: expected all addresses to be true")
}
if lastFilterRequest.AllTopics == false {
if !lastFilterRequest.AllTopics {
t.Error("3: expected all topics to be true")
}
if len(lastFilterRequest.Addresses) != 1 && gointerfaces.ConvertH160toAddress(lastFilterRequest.Addresses[0]) != gointerfaces.ConvertH160toAddress(address1H160) {
Expand All @@ -323,10 +323,10 @@ func TestFilters_SubscribeLogsGeneratesCorrectLogFilterRequest(t *testing.T) {
// have empty addresses and topics between the two of them. Effectively the state should be the same as the
// subscription in step 3
f.UnsubscribeLogs(id1)
if lastFilterRequest.AllAddresses == false {
if !lastFilterRequest.AllAddresses {
t.Error("4: expected all addresses to be true")
}
if lastFilterRequest.AllTopics == false {
if !lastFilterRequest.AllTopics {
t.Error("4: expected all topics to be true")
}
if len(lastFilterRequest.Addresses) != 1 && gointerfaces.ConvertH160toAddress(lastFilterRequest.Addresses[0]) != gointerfaces.ConvertH160toAddress(address1H160) {
Expand All @@ -340,10 +340,10 @@ func TestFilters_SubscribeLogsGeneratesCorrectLogFilterRequest(t *testing.T) {
// specifies a topic. All addresses should be present still. The state should represent the single
// subscription in step 3
f.UnsubscribeLogs(id2)
if lastFilterRequest.AllAddresses == false {
if !lastFilterRequest.AllAddresses {
t.Error("5: expected all addresses to be true")
}
if lastFilterRequest.AllTopics == true {
if lastFilterRequest.AllTopics {
t.Error("5: expected all topics to be false")
}
if len(lastFilterRequest.Addresses) != 0 {
Expand All @@ -356,10 +356,10 @@ func TestFilters_SubscribeLogsGeneratesCorrectLogFilterRequest(t *testing.T) {
// unsubscribing the last filter should leave us with false for the all addresses and all topics
// and nothing in the address or topics lists
f.UnsubscribeLogs(id3)
if lastFilterRequest.AllAddresses == true {
if lastFilterRequest.AllAddresses {
t.Error("6: expected all addresses to be false")
}
if lastFilterRequest.AllTopics == true {
if lastFilterRequest.AllTopics {
t.Error("6: expected all topics to be false")
}
if len(lastFilterRequest.Addresses) != 0 {
Expand Down
Loading