Revert: feat(adjudicate): stateMap to signedState: This reverts commit 2bb1a55.

Signed-off-by: Minh Huy Tran <huy@perun.network>

Author: NhoxxKienn

channel/adjudicator.go

@@ -207,7 +207,7 @@ type (
 	}
 
 	// StateMap represents a channel state tree.
-	StateMap map[ID]*SignedState
+	StateMap map[ID]*State
 )
 
 // NewProgressReq creates a new ProgressReq object.
@@ -305,12 +305,12 @@ func (t *TimeTimeout) String() string {
 
 // MakeStateMap creates a new StateMap object.
 func MakeStateMap() StateMap {
-	return make(map[ID]*SignedState)
+	return make(map[ID]*State)
 }
 
 // Add adds the given states to the state map.
-func (m StateMap) Add(states ...*SignedState) {
+func (m StateMap) Add(states ...*State) {
 	for _, s := range states {
-		m[s.State.ID] = s
+		m[s.ID] = s
 	}
 }

client/adjudicate.go

@@ -445,11 +445,7 @@ func (c *Channel) gatherSubChannelStates() (states []channel.SignedState, err er
 func (c *Channel) subChannelStateMap() (states channel.StateMap, err error) {
 	states = channel.MakeStateMap()
 	err = c.applyToSubChannelsRecursive(func(c *Channel) error {
-		states[c.ID()] = &channel.SignedState{
-			Params: c.Params(),
-			State:  c.machine.CurrentTX().State,
-			Sigs:   c.machine.CurrentTX().Sigs,
-		}
+		states[c.ID()] = c.state()
 		return nil
 	})
 	return

client/test/backend.go

@@ -265,7 +265,7 @@ func (b *MockBackend) Withdraw(_ context.Context, req channel.AdjudicatorReq, su
 	states[0] = req.Tx.State
 	i := 1
 	for _, s := range subStates {
-		states[i] = s.State
+		states[i] = s
 		i++
 	}
 	if err := b.checkStates(states, checkWithdraw); err != nil {
@@ -361,7 +361,7 @@ func (b *MockBackend) setLatestEvent(ch channel.ID, e channel.AdjudicatorEvent)
 func outcomeRecursive(state *channel.State, subStates channel.StateMap) (outcome channel.Balances) {
 	outcome = state.Balances.Clone()
 	for _, subAlloc := range state.Locked {
-		subOutcome := outcomeRecursive(subStates[subAlloc.ID].State, subStates)
+		subOutcome := outcomeRecursive(subStates[subAlloc.ID], subStates)
 		for a, bals := range subOutcome {
 			for p, bal := range bals {
 				_p := p

client/test/subchannel_dispute.go

@@ -106,7 +106,7 @@ func (r *DisputeSusie) exec(_cfg ExecConfig, ledgerChannel *paymentChannel) {
 
 	r.log.Debug("Attempt withdrawing refuted state.")
 	m := channel.MakeStateMap()
-	m.Add(&subState0)
+	m.Add(subState0.State)
 	err = r.setup.Adjudicator.Withdraw(ctx, reqLedger, m)
 	r.RequireTruef(err != nil, "withdraw should fail because other party should have refuted.")