changed rlp to json

eth/plasma.go

@@ -3,14 +3,14 @@ package eth
 import (
 	"context"
 	"crypto/ecdsa"
+	"encoding/json"
 	"errors"
 	rootchain "github.com/FourthState/plasma-mvp-sidechain/contracts/wrappers"
 	plasmaTypes "github.com/FourthState/plasma-mvp-sidechain/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/comparer"
 	"github.com/syndtr/goleveldb/leveldb/memdb"
@@ -115,7 +115,7 @@ func (plasma *Plasma) GetDeposit(nonce sdk.Uint) (*plasmaTypes.Deposit, error) {
 
 	var deposit plasmaTypes.Deposit
 	// check against the contract if the deposit is not in the cache or decoding fail
-	if err != nil && deserializeDeposit(data, &deposit) != nil {
+	if err != nil && json.Unmarshal(data, &deposit) != nil {
 		if plasma.memdb.Contains(key) {
 			plasma.logger.Info("corrupted deposit found within db")
 			plasma.memdb.Delete(key)
@@ -139,11 +139,7 @@ func (plasma *Plasma) GetDeposit(nonce sdk.Uint) (*plasmaTypes.Deposit, error) {
 	}
 
 	// save to the db
-	data, err = rlp.EncodeToBytes(serializedDeposit{
-		owner:    deposit.Owner,
-		amount:   deposit.Amount.BigInt().Bytes(),
-		blocknum: deposit.BlockNum.BigInt().Bytes(),
-	})
+	data, err = json.Marshal(deposit)
 	if err != nil {
 		plasma.logger.Error("error encoding deposit. will not be cached")
 	} else {
@@ -188,16 +184,16 @@ func watchDeposits(plasma *Plasma) {
 		key := prefixKey(depositPrefix, deposit.DepositNonce.Bytes())
 
 		// remove the nonce, encode, and store
-		val, err := rlp.EncodeToBytes(serializedDeposit{
-			owner:    deposit.Depositor,
-			amount:   deposit.Amount.Bytes(),
-			blocknum: deposit.EthBlockNum.Bytes(),
+		data, err := json.Marshal(plasmaTypes.Deposit{
+			Owner:    deposit.Depositor,
+			Amount:   sdk.NewUintFromBigInt(deposit.Amount),
+			BlockNum: sdk.NewUintFromBigInt(deposit.EthBlockNum),
 		})
 
 		if err != nil {
 			plasma.logger.Error("Error encoding deposit event from contract -", deposit)
 		} else {
-			plasma.memdb.Put(key, val)
+			plasma.memdb.Put(key, data)
 		}
 	}
 }
@@ -243,17 +239,3 @@ func watchEthBlocks(plasma *Plasma, ch <-chan *types.Header) {
 
 	plasma.logger.Info("Block subscription closed.")
 }
-
-func deserializeDeposit(data []byte, deposit *plasmaTypes.Deposit) error {
-	var dep serializedDeposit
-	if err := rlp.DecodeBytes(data, &dep); err != nil {
-		return err
-	}
-
-	deposit.Owner = dep.owner
-	deposit.Amount = sdk.NewUintFromBigInt(new(big.Int).SetBytes(dep.amount))
-	deposit.Amount = sdk.NewUintFromBigInt(new(big.Int).SetBytes(dep.amount))
-	deposit.BlockNum = sdk.NewUintFromBigInt(new(big.Int).SetBytes(dep.blocknum))
-
-	return nil
-}

eth/plasma_test.go

@@ -64,11 +64,7 @@ func TestSubmitBlock(t *testing.T) {
 	logger := log.NewTMLogger(os.Stderr)
 	client, _ := InitEthConn(clientAddr, logger)
 
-	privKey, err := crypto.HexToECDSA(operatorPrivKey)
-	if err != nil {
-		t.Fatal("Could not convert hex private key")
-	}
-
+	privKey, _ := crypto.HexToECDSA(operatorPrivKey)
 	plasma, _ := InitPlasma(plasmaContractAddr, privKey, client, logger, 1)
 
 	blockNum, err := plasma.session.LastCommittedBlock()
@@ -99,3 +95,26 @@ func TestSubmitBlock(t *testing.T) {
 		t.Errorf("Mismatch in block headers.\nGot: %x\nExpected: %x", result, header)
 	}
 }
+
+func TestEthBlockWatching(t *testing.T) {
+	logger := log.NewTMLogger(os.Stderr)
+	client, _ := InitEthConn(clientAddr, logger)
+
+	privKey, _ := crypto.HexToECDSA(operatorPrivKey)
+	plasma, _ := InitPlasma(plasmaContractAddr, privKey, client, logger, 1)
+
+	lastBlockNum := plasma.ethBlockNum
+	t.Log(lastBlockNum)
+
+	// mine a block
+	err := client.rpc.Call(nil, "evm_mine")
+	if err != nil {
+		t.Fatal("Could not mine a block -", err)
+	}
+
+	t.Log(plasma.ethBlockNum)
+
+	if plasma.ethBlockNum.Cmp(lastBlockNum.Add(lastBlockNum, big.NewInt(1))) != 0 {
+		t.Error("Client did not catch the minted block and update correctly")
+	}
+}