diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
| commit | 5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb (patch) | |
| tree | d5ba6197a8c0c8e36bb92ee9fc8aad717cb2d178 /state/state_test.go | |
| parent | 8393dab470c40678caf36ada82e312d29c4cf5c4 (diff) | |
| parent | 22893b7ac925c49168c119f293ea8befc3aff5cc (diff) | |
| download | dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.gz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.bz2 dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.lz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.xz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.zst dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.zip | |
Merge remote-tracking branch 'upstream/develop' into frontier/js
Conflicts:
cmd/ethereum/js.go
javascript/types.go
Diffstat (limited to 'state/state_test.go')
| -rw-r--r-- | state/state_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/state/state_test.go b/state/state_test.go index 07e35f7e2..3ecc03ae0 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -6,7 +6,7 @@ import ( checker "gopkg.in/check.v1" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" ) type StateSuite struct { @@ -63,9 +63,9 @@ func (s *StateSuite) SetUpTest(c *checker.C) { func (s *StateSuite) TestSnapshot(c *checker.C) { stateobjaddr := []byte("aa") - storageaddr := ethutil.Big("0") - data1 := ethutil.NewValue(42) - data2 := ethutil.NewValue(43) + storageaddr := common.Big("0") + data1 := common.NewValue(42) + data2 := common.NewValue(43) // get state object stateObject := s.state.GetOrNewStateObject(stateobjaddr) |