Parse account storage (#323)

* Parse account storage

* Parse account storage

* fix test

* fix test

* use jsoncdc on account storage

* return empty strings on err

Author: DylanTinianov

blockchain/flowkit.go

@@ -413,14 +413,11 @@ func (fk *flowKit) getAccountStorage(address flow.Address) (string, error) {
 		return "", err
 	}
 
-	/* TODO: Parse account storage
-	_, err = ParseAccountStorage(val)
+	storage, err := jsoncdc.Encode(val)
 	if err != nil {
 		return "", err
 	}
-	*/
-
-	return val.String(), nil
+	return string(storage), nil
 }
 
 func (fk *flowKit) getAccount(address flow.Address) (*flow.Account, error) {

blockchain/flowkit_test.go

@@ -66,8 +66,7 @@ func Test_NewFlowkit(t *testing.T) {
 		assert.NoError(t, err)
 
 		assert.Equal(t, account.Address, accountList[i].Address)
-		assert.Contains(t, accountStorage, "A.0000000000000003.FlowToken.Vault(uuid:")
-		assert.Contains(t, accountStorage, `"path": /storage/flowTokenVault`)
+		assert.Contains(t, accountStorage, "A.0000000000000003.FlowToken.Vault")
 	}
 }
 

blockchain/storage.go

@@ -18,14 +18,6 @@
 
 package blockchain
 
-type AccountStorage any
-
-type StorageItem struct {
-	Value interface{}
-	Type  interface{}
-	Path  interface{}
-}
-
 const StorageIteration = `
 pub fun main(address: Address) : AnyStruct{
 
@@ -64,26 +56,3 @@ pub fun main(address: Address) : AnyStruct{
 	})
 	return res
 }`
-
-//type StorageItem map[interface{}]interface{}
-
-/* TODO: Parse account storage into a useful format or structure
-func ParseAccountStorage(rawStorage cadence.Value) (*AccountStorage, error) {
-	encoded, err := jsoncdc.Encode(rawStorage)
-	if err != nil {
-		return nil, err
-	}
-
-	var storage AccountStorage
-	err = yaml.Unmarshal(encoded, &storage)
-	if err != nil {
-		fmt.Println("ERROR Unmarshal", err.Error())
-	}
-
-	for key, val := range storage.(map[interface{}]interface{}) {
-		fmt.Println("Key, val:", key, ",", val)
-	}
-
-	return nil, nil
-}
-*/

e2eTest/account_test.go

@@ -19,7 +19,6 @@
 package e2eTest
 
 import (
-	"encoding/json"
 	"github.com/dapperlabs/flow-playground-api/e2eTest/client"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -80,8 +79,6 @@ func TestAccountDeployedContracts(t *testing.T) {
 }
 
 func TestAccountStorage(t *testing.T) {
-	t.Skip("Account storage parsing not implemented with FlowKit") // TODO: Add back account storage
-
 	c := newClient()
 
 	project := createProject(t, c)
@@ -96,12 +93,9 @@ func TestAccountStorage(t *testing.T) {
 		client.Var("address", account.Address),
 	)
 	require.NoError(t, err)
-
 	assert.Equal(t, account.Address, accResp.Account.Address)
-	assert.Equal(t, `{}`, accResp.Account.State)
 
 	var resp CreateTransactionExecutionResponse
-
 	const script = `
 		transaction {
 		  prepare(signer: AuthAccount) {
@@ -128,25 +122,9 @@ func TestAccountStorage(t *testing.T) {
 		client.Var("address", account.Address),
 	)
 	require.NoError(t, err)
-
 	assert.Equal(t, account.Address, accResp.Account.Address)
-	assert.NotEmpty(t, accResp.Account.State)
-
-	type accountStorage struct {
-		Private map[string]any
-		Public  map[string]any
-		Storage map[string]any
-	}
-
-	var accStorage accountStorage
-	err = json.Unmarshal([]byte(accResp.Account.State), &accStorage)
-	require.NoError(t, err)
-
-	assert.Equal(t, "storage value", accStorage.Storage["storageTest"])
-	assert.NotEmpty(t, accStorage.Private["privateTest"])
-	assert.NotEmpty(t, accStorage.Public["publicTest"])
 
-	assert.NotContains(t, accStorage.Public, "flowTokenBalance")
-	assert.NotContains(t, accStorage.Public, "flowTokenReceiver")
-	assert.NotContains(t, accStorage.Storage, "flowTokenVault")
+	assert.Contains(t, accResp.Account.State, `storageTest`)
+	assert.Contains(t, accResp.Account.State, `publicTest`)
+	assert.Contains(t, accResp.Account.State, `privateTest`)
 }

e2eTest/contract_deployments_test.go

@@ -355,7 +355,7 @@ func TestContractRedeployment(t *testing.T) {
 		require.NoError(t, err)
 		require.Contains(t,
 			accResp.Account.State,
-			`{"value": A.0000000000000005.Person.Friendship`)
+			`A.0000000000000005.Person.Friendship`)
 
 		PersonContractUpdate := `
 		pub contract Person {