Merge pull request hyperledger-archives#912 from silasdavis/state

Refactor state into refs and tree.

Gopkg.toml

@@ -20,7 +20,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/iavl"
-  version = "=0.10.0"
+  version = "=0.11.0"
 
 # Haven't made a release since 2016.
 [[constraint]]

deploy/def/client.go

@@ -49,7 +49,7 @@ func (c *Client) Dial(chainAddress, keysClientAddress string) error {
 		logrus.Info("Using mempool signing since no keyClient set, pass --keys to sign locally or elsewhere")
 		c.MempoolSigning = true
 	} else {
-		logrus.Info("Using keys server at: %s", keysClientAddress)
+		logrus.Infof("Using keys server at: %s", keysClientAddress)
 		c.keyClient, err = keys.NewRemoteKeyClient(keysClientAddress, logging.NewNoopLogger())
 	}
 
@@ -227,7 +227,7 @@ func (c *Client) UpdateAccount(arg *GovArg) (*payload.GovTx, error) {
 			if c.keyClient != nil {
 				publicKey, err := c.keyClient.PublicKey(*update.Address)
 				if err != nil {
-					logrus.Info("Could not retrieve public key for %v from keys server", *update.Address)
+					logrus.Infof("Could not retrieve public key for %v from keys server", *update.Address)
 				} else {
 					update.PublicKey = &publicKey
 				}

execution/evm/vm.go

@@ -608,7 +608,7 @@ func (vm *VM) call(callState *state.Cache, caller acm.Account, callee *acm.Mutab
 
 		case GASPRICE_DEPRECATED: // 0x3A
 			stack.Push(Zero256)
-			vm.Debugf(" => %X (GASPRICE IS DEPRECATED)\n")
+			vm.Debugf(" => %X (GASPRICE IS DEPRECATED)\n", Zero256)
 
 		case EXTCODESIZE: // 0x3B
 			addr := stack.Pop()

execution/execution_test.go

@@ -893,7 +893,7 @@ func TestTxSequence(t *testing.T) {
 func TestNameTxs(t *testing.T) {
 	st, err := MakeGenesisState(dbm.NewMemDB(), testGenesisDoc)
 	require.NoError(t, err)
-	st.writeState.save()
+	st.writeState.commit()
 
 	names.MinNameRegistrationPeriod = 5
 	exe := makeExecutor(st)
@@ -1196,7 +1196,7 @@ func TestMerklePanic(t *testing.T) {
 	acc0 := getAccount(st, privAccounts[0].Address())
 	acc1 := getAccount(st, privAccounts[1].Address())
 
-	st.writeState.save()
+	st.writeState.commit()
 	// SendTx.
 	{
 		tx := &payload.SendTx{
@@ -1238,7 +1238,7 @@ func TestMerklePanic(t *testing.T) {
 		err := makeExecutor(stateCallTx).signExecuteCommit(tx, privAccounts[0])
 		require.NoError(t, err)
 	}
-	st.writeState.save()
+	st.writeState.commit()
 	trygetacc0 := getAccount(st, privAccounts[0].Address())
 	fmt.Println(trygetacc0.Address())
 }
@@ -1499,7 +1499,7 @@ func makeGenesisState(numAccounts int, randBalance bool, minBalance uint64, numV
 	if err != nil {
 		panic(fmt.Errorf("could not make genesis state: %v", err))
 	}
-	s0.writeState.save()
+	s0.writeState.commit()
 	return s0, privAccounts
 }