move dep expansion into predicates for the moment

[scpubgit/DX.git] / lib / DX / Step / ResolveProposition.pm

diff --git a/lib/DX/Step/ResolveProposition.pm b/lib/DX/Step/ResolveProposition.pm
index a064b5f..acd38d5 100644 (file)
--- a/lib/DX/Step/ResolveProposition.pm
+++ b/lib/DX/Step/ResolveProposition.pm
@@ -9,34 +9,15 @@ use DX::Class;
 
 with 'DX::Role::Step';
 
-has resolves => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  $self->resolution_space->proposition;
-});
-
 has resolution_space => (is => 'ro', isa => ResolutionSpace);
 
-has current_resolution => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  $self->resolution_space->next_resolution;
-});
-
-has actions => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  $self->current_resolution->actions;
-});
-
-has depends_on => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  expand_deps($self->current_resolution->veracity_depends_on);
-});
-
-has alternative_step => (is => 'lazy', init_arg => undef, builder => sub {
-  my ($self) = @_;
-  my $rspace = $self->resolution_space->remaining_resolution_space;
-  return undef unless @{$rspace->members};
-  return $rspace->next_step;
-});
+sub resolves { shift->resolution_space->proposition }
+
+sub current_resolution { shift->resolution_space->next_resolution }
+
+sub actions { shift->current_resolution->actions }
+
+sub depends_on { shift->current_resolution->veracity_depends_on }
 
 sub but_first {
   my ($self, @actions) = @_;