39c2a55942
* port statediff from 9b7fd9af80/statediff/statediff.go; minor fixes
* integrating state diff extracting, building, and persisting into geth processes
* work towards persisting created statediffs in ipfs; based off github.com/vulcanize/eth-block-extractor
* Add a state diff service
* Remove diff extractor from blockchain
* Update imports
* Move statediff on/off check to geth cmd config
* Update starting state diff service
* Add debugging logs for creating diff
* Add statediff extractor and builder tests and small refactoring
* Start to write statediff to a CSV
* Restructure statediff directory
* Pull CSV publishing methods into their own file
* Reformatting due to go fmt
* Add gomega to vendor dir
* Remove testing focuses
* Update statediff tests to use golang test pkg
instead of ginkgo
- builder_test
- extractor_test
- publisher_test
* Use hexutil.Encode instead of deprecated common.ToHex
* Remove OldValue from DiffBigInt and DiffUint64 fields
* Update builder test
* Remove old storage value from updated accounts
* Remove old values from created/deleted accounts
* Update publisher to account for only storing current account values
* Update service loop and fetching previous block
* Update testing
- remove statediff ginkgo test suite file
- move mocks to their own dir
* Updates per go fmt
* Updates to tests
* Pass statediff mode and path in through cli
* Return filename from publisher
* Remove some duplication in builder
* Remove code field from state diff output
this is the contract byte code, and it can still be obtained by querying
the db by the codeHash
* Consolidate acct diff structs for updated & updated/deleted accts
* Include block number in csv filename
* Clean up error logging
* Cleanup formatting, spelling, etc
* Address PR comments
* Add contract address and storage value to csv
* Refactor accumulating account row in csv publisher
* Add DiffStorage struct
* Add storage key to csv
* Address PR comments
* Fix publisher to include rows for accounts that don't have store updates
* Update builder test after merging in release/1.8
* Update test contract to include storage on contract intialization
- so that we're able to test that storage diffing works for created and
deleted accounts (not just updated accounts).
* Factor out a common trie iterator method in builder
66 lines
2.2 KiB
Go
66 lines
2.2 KiB
Go
package matchers
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/onsi/gomega/format"
|
|
)
|
|
|
|
type MatchJSONMatcher struct {
|
|
JSONToMatch interface{}
|
|
firstFailurePath []interface{}
|
|
}
|
|
|
|
func (matcher *MatchJSONMatcher) Match(actual interface{}) (success bool, err error) {
|
|
actualString, expectedString, err := matcher.prettyPrint(actual)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
|
|
var aval interface{}
|
|
var eval interface{}
|
|
|
|
// this is guarded by prettyPrint
|
|
json.Unmarshal([]byte(actualString), &aval)
|
|
json.Unmarshal([]byte(expectedString), &eval)
|
|
var equal bool
|
|
equal, matcher.firstFailurePath = deepEqual(aval, eval)
|
|
return equal, nil
|
|
}
|
|
|
|
func (matcher *MatchJSONMatcher) FailureMessage(actual interface{}) (message string) {
|
|
actualString, expectedString, _ := matcher.prettyPrint(actual)
|
|
return formattedMessage(format.Message(actualString, "to match JSON of", expectedString), matcher.firstFailurePath)
|
|
}
|
|
|
|
func (matcher *MatchJSONMatcher) NegatedFailureMessage(actual interface{}) (message string) {
|
|
actualString, expectedString, _ := matcher.prettyPrint(actual)
|
|
return formattedMessage(format.Message(actualString, "not to match JSON of", expectedString), matcher.firstFailurePath)
|
|
}
|
|
|
|
func (matcher *MatchJSONMatcher) prettyPrint(actual interface{}) (actualFormatted, expectedFormatted string, err error) {
|
|
actualString, ok := toString(actual)
|
|
if !ok {
|
|
return "", "", fmt.Errorf("MatchJSONMatcher matcher requires a string, stringer, or []byte. Got actual:\n%s", format.Object(actual, 1))
|
|
}
|
|
expectedString, ok := toString(matcher.JSONToMatch)
|
|
if !ok {
|
|
return "", "", fmt.Errorf("MatchJSONMatcher matcher requires a string, stringer, or []byte. Got expected:\n%s", format.Object(matcher.JSONToMatch, 1))
|
|
}
|
|
|
|
abuf := new(bytes.Buffer)
|
|
ebuf := new(bytes.Buffer)
|
|
|
|
if err := json.Indent(abuf, []byte(actualString), "", " "); err != nil {
|
|
return "", "", fmt.Errorf("Actual '%s' should be valid JSON, but it is not.\nUnderlying error:%s", actualString, err)
|
|
}
|
|
|
|
if err := json.Indent(ebuf, []byte(expectedString), "", " "); err != nil {
|
|
return "", "", fmt.Errorf("Expected '%s' should be valid JSON, but it is not.\nUnderlying error:%s", expectedString, err)
|
|
}
|
|
|
|
return abuf.String(), ebuf.String(), nil
|
|
}
|