Change program dependencies to common location

Author: janezpodhostnik

fvm/derived/derived_block_data.go

@@ -37,11 +37,11 @@ type DerivedTransactionCommitter interface {
 	Commit() error
 }
 
-// ProgramDependencies are the programs' addresses used by this program.
-type ProgramDependencies map[common.AddressLocation]struct{}
+// ProgramDependencies are the programs' locations used by this program.
+type ProgramDependencies map[common.Location]struct{}
 
-// AddDependency adds the address as a dependency.
-func (d ProgramDependencies) AddDependency(location common.AddressLocation) {
+// AddDependency adds the location as a dependency.
+func (d ProgramDependencies) AddDependency(location common.Location) {
 	d[location] = struct{}{}
 }
 

fvm/environment/derived_data_invalidator_test.go

@@ -32,7 +32,7 @@ func TestDerivedDataProgramInvalidator(t *testing.T) {
 	programALoc := common.AddressLocation{Address: cAddressA, Name: "A"}
 	programA := &derived.Program{
 		Program: nil,
-		Dependencies: map[common.AddressLocation]struct{}{
+		Dependencies: map[common.Location]struct{}{
 			programALoc: {},
 		},
 	}
@@ -42,7 +42,7 @@ func TestDerivedDataProgramInvalidator(t *testing.T) {
 	programBLoc := common.AddressLocation{Address: cAddressB, Name: "B"}
 	programB := &derived.Program{
 		Program: nil,
-		Dependencies: map[common.AddressLocation]struct{}{
+		Dependencies: map[common.Location]struct{}{
 			programALoc: {},
 			programBLoc: {},
 		},
@@ -53,7 +53,7 @@ func TestDerivedDataProgramInvalidator(t *testing.T) {
 	programDLoc := common.AddressLocation{Address: cAddressD, Name: "D"}
 	programD := &derived.Program{
 		Program: nil,
-		Dependencies: map[common.AddressLocation]struct{}{
+		Dependencies: map[common.Location]struct{}{
 			programDLoc: {},
 		},
 	}
@@ -63,7 +63,7 @@ func TestDerivedDataProgramInvalidator(t *testing.T) {
 	programCLoc := common.AddressLocation{Address: cAddressC, Name: "C"}
 	programC := &derived.Program{
 		Program: nil,
-		Dependencies: map[common.AddressLocation]struct{}{
+		Dependencies: map[common.Location]struct{}{
 			// C indirectly depends on A trough B
 			programALoc: {},
 			programBLoc: {},

fvm/environment/programs.go

@@ -277,7 +277,7 @@ func (loader *programLoader) loadWithDependencyTracking(
 //     (because A also depends on everything B depends on)
 //   - set(A): pop A, getting all the collected dependencies for A
 type dependencyTracker struct {
-	location     common.AddressLocation
+	location     common.Location
 	dependencies derived.ProgramDependencies
 }
 
@@ -295,7 +295,7 @@ func newDependencyStack() *dependencyStack {
 
 // push a new location to track dependencies for.
 // it is assumed that the dependencies will be loaded before the program is set and pop is called.
-func (s *dependencyStack) push(loc common.AddressLocation) {
+func (s *dependencyStack) push(loc common.Location) {
 	dependencies := make(derived.ProgramDependencies, 1)
 
 	// A program is listed as its own dependency.
@@ -320,9 +320,9 @@ func (s *dependencyStack) addDependencies(dependencies derived.ProgramDependenci
 }
 
 // pop the last dependencies on the stack and return them.
-func (s *dependencyStack) pop() (common.AddressLocation, derived.ProgramDependencies, error) {
+func (s *dependencyStack) pop() (common.Location, derived.ProgramDependencies, error) {
 	if len(s.trackers) == 0 {
-		return common.AddressLocation{},
+		return nil,
 			nil,
 			fmt.Errorf("cannot pop the programs dependency stack, because it is empty")
 	}